things mostly working

This commit is contained in:
Raphael 2010-08-17 18:27:50 -07:00
parent 6901b4f83e
commit 8619584834
4 changed files with 9 additions and 11 deletions

View file

@ -1,7 +1,6 @@
class ApplicationController < ActionController::Base
protect_from_forgery :except => :receive
layout 'application'
before_filter :set_friends_and_status, :count_requests

View file

@ -2,8 +2,7 @@ class User
include MongoMapper::Document
devise :database_authenticatable, :registerable,
:recoverable, :rememberable, :trackable, :validatable,
:confirmable
:recoverable, :rememberable, :trackable, :validatable
key :friend_ids, Array
key :pending_request_ids, Array
@ -304,7 +303,7 @@ class User
def setup_person
self.person.serialized_key ||= generate_key.export
self.person.email = email
self.person.save
self.person.save!
end
def generate_key

View file

@ -14,7 +14,7 @@
= f.password_field :password_confirmation
= f.fields_for :person do |p|
= p.hidden_field :url, :value => request.path
= p.hidden_field :url, :value => request.host
= p.fields_for :profile do |pr|
%p

View file

@ -2,7 +2,7 @@ Diaspora::Application.routes.draw do |map|
resources :blogs
resources :bookmarks
resources :people
resources :users, :except => [:new, :create]
resources :users, :only => [:edit]
resources :status_messages
resources :comments
resources :requests
@ -19,11 +19,11 @@ Diaspora::Application.routes.draw do |map|
#routes for devise, not really sure you will need to mess with this in the future, lets put default,
#non mutable stuff in anohter file
devise_for :users do
match 'login', :to => 'devise/sessions#new'
match 'logout', :to => 'devise/sessions#destroy'
match 'get_to_the_choppa', :to => 'devise/registrations#new'
end
devise_for :users
match 'login', :to => 'devise/sessions#new', :as => "new_user_session"
match 'logout', :to => 'devise/sessions#destroy', :as => "destroy_user_session"
match 'get_to_the_choppa', :to => 'devise/registrations#new', :as => "new_user_registration"
#public routes
#
match 'webfinger', :to => 'publics#webfinger'