nocebo/diaspora
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'master' of github.com:diaspora/diaspora

Browse source
This commit is contained in:
maxwell 2010-08-19 10:46:58 -07:00
commit 9942aef5d4
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
app/models/user.rb
View file

@ -16,7 +16,7 @@ class User
many :groups, :class_name => 'Group' many :groups, :class_name => 'Group'
before_validation_on_create :assign_key before_validation_on_create :setup_person
before_validation :do_bad_things before_validation :do_bad_things
######## Making things work ######## ######## Making things work ########
@ -330,7 +330,7 @@ class User
end end
def setup_person def setup_person
self.person.serialized_key ||= generate_key.export assign_key
self.person.email = email self.person.email = email
self.person.save! self.person.save!
end end

2
config/routes.rb
View file

@ -1,6 +1,6 @@
Diaspora::Application.routes.draw do Diaspora::Application.routes.draw do
resources :people resources :people
resources :users #, :only => [:edit, :show, :update] resources :users, :except => [:create, :new]
resources :status_messages resources :status_messages
resources :comments resources :comments
resources :requests resources :requests