projects
/
selectricity
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Added funcitionality so user can change the email address associated with their accou...
[selectricity]
/
app
/
controllers
/
account_controller.rb
diff --git
a/app/controllers/account_controller.rb
b/app/controllers/account_controller.rb
index 524d743ee0161551cbb97909f26f179e3c93e134..ce4303dde9694e64a1c00d9293ba291e5abcf85e 100644
(file)
--- a/
app/controllers/account_controller.rb
+++ b/
app/controllers/account_controller.rb
@@
-1,3
+1,10
@@
+# Selectricity: Voting Machinery for the Masses
+# Copyright (C) 2007, 2008 Benjamin Mako Hill <mako@atdot.cc>
+# Copyright (C) 2007 Massachusetts Institute of Technology
+#
+# This program is free software. Please see the COPYING file for
+# details.
+
class AccountController < ApplicationController
layout 'main'
class AccountController < ApplicationController
layout 'main'
@@
-14,6
+21,7
@@
class AccountController < ApplicationController
#these methods provide basic functionality for the user login system
#===================================================================
def login
#these methods provide basic functionality for the user login system
#===================================================================
def login
+
return unless request.post?
self.current_user = User.authenticate(params[:login], params[:password])
if logged_in?
return unless request.post?
self.current_user = User.authenticate(params[:login], params[:password])
if logged_in?
@@
-21,7
+29,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 => '/site', :action => 'index')
+ redirect_back_or_default
:controller => 'front'
flash[:notice] = "Logged in successfully"
end
end
flash[:notice] = "Logged in successfully"
end
end
@@
-35,7
+43,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 => '/site', :action => 'index')
+ redirect_back_or_default
:controller => 'front'
flash[:notice] = "Thanks for signing up!"
rescue ActiveRecord::RecordInvalid
render :action => 'signup'
flash[:notice] = "Thanks for signing up!"
rescue ActiveRecord::RecordInvalid
render :action => 'signup'
@@
-46,15
+54,24
@@
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 => '/site', :action => 'index')
+ redirect_back_or_default
:controller => 'front'
end
#======================================================================
end
#======================================================================
- #The following methods are for slectricity specific uses
+ #The following methods are for s
e
lectricity specific uses
def summary
@user = User.find(params[:id])
end
def summary
@user = User.find(params[:id])
end
+ def change_contact
+ @user = User.find(params[:id])
+ return unless request.post?
+ @user.email=params[:email]
+ @user.save!
+ flash[:notice] = "Email successfully updated"
+ render :action => 'summary'
+ end
+
end
end
Benjamin Mako Hill
||
Want to submit a patch?