projects
/
selectricity
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
The user model has been modified so that it stores the user object itself in the...
[selectricity]
/
app
/
controllers
/
account_controller.rb
diff --git
a/app/controllers/account_controller.rb
b/app/controllers/account_controller.rb
index c13203b793283f6b34746f7acfb7f11c70345b87..031368b84327d7a1f5d397362686462b0f974859 100644
(file)
--- a/
app/controllers/account_controller.rb
+++ b/
app/controllers/account_controller.rb
@@
-19,7
+19,7
@@
class AccountController < ApplicationController
self.current_user.remember_me
cookies[:auth_token] = { :value => self.current_user.remember_token , :expires => self.current_user.remember_token_expires_at }
end
self.current_user.remember_me
cookies[:auth_token] = { :value => self.current_user.remember_token , :expires => self.current_user.remember_token_expires_at }
end
- redirect_back_or_default(:controller => '/
account
', :action => 'index')
+ redirect_back_or_default(:controller => '/
site
', :action => 'index')
flash[:notice] = "Logged in successfully"
end
end
flash[:notice] = "Logged in successfully"
end
end
@@
-29,7
+29,7
@@
class AccountController < ApplicationController
return unless request.post?
@user.save!
self.current_user = @user
return unless request.post?
@user.save!
self.current_user = @user
- redirect_back_or_default(:controller => '/
account
', :action => 'index')
+ redirect_back_or_default(:controller => '/
site
', :action => 'index')
flash[:notice] = "Thanks for signing up!"
rescue ActiveRecord::RecordInvalid
render :action => 'signup'
flash[:notice] = "Thanks for signing up!"
rescue ActiveRecord::RecordInvalid
render :action => 'signup'
@@
-40,6
+40,6
@@
class AccountController < ApplicationController
cookies.delete :auth_token
reset_session
flash[:notice] = "You have been logged out."
cookies.delete :auth_token
reset_session
flash[:notice] = "You have been logged out."
- redirect_back_or_default(:controller => '/
account
', :action => 'index')
+ redirect_back_or_default(:controller => '/
site
', :action => 'index')
end
end
end
end
Benjamin Mako Hill
||
Want to submit a patch?