Mercurial > hg > soundsoftware-site

diff app/controllers/users_controller.rb @ 120:cd2282d2aa55 cannam

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge from the default branch. Note that this is not a valid SVN repository any more (use default, redmine-1.1 etc for SVN updates).
author Chris Cannam
date Thu, 13 Jan 2011 14:33:08 +0000
parents b859cc0c4fa1
children 5e974759e8b2
line wrap: on
line diff
--- a/app/controllers/users_controller.rb	Thu Jan 13 13:21:03 2011 +0000
+++ b/app/controllers/users_controller.rb	Thu Jan 13 14:33:08 2011 +0000
@@ -62,7 +62,6 @@
   end
   
   def show
-    @user = User.find(params[:id])
 
     if @user.ssamr_user_detail != nil
       @description = @user.ssamr_user_detail.description
@@ -153,7 +152,6 @@
   
   verify :method => :put, :only => :update, :render => {:nothing => true, :status => :method_not_allowed }
   def update
-
     @user.admin = params[:user][:admin] if params[:user][:admin]
     @user.login = params[:user][:login] if params[:user][:login]
     if params[:user][:password].present? && (@user.auth_source_id.nil? || params[:user][:auth_source_id].blank?)