various user bits

[rails.git] / app / controllers / user_controller.rb

diff --git a/app/controllers/user_controller.rb b/app/controllers/user_controller.rb
index 4a4d4d855a5c2b7681dcec9d98d2e1d5a31bae88..599521265cc9cb8c4ed3121718c93fa57179d9e4 100644 (file)
--- a/app/controllers/user_controller.rb
+++ b/app/controllers/user_controller.rb
@@ -2,9 +2,9 @@ class UserController < ApplicationController
   layout 'site'
 
   before_filter :authorize, :only => :preferences
-  before_filter :authorize_web, :only => :rename
-
-  
+  before_filter :authorize_web, :only => [:rename, :account]
+  before_filter :require_user, :only => [:account, :display_name_edit]
+ 
   def save
     @user = User.new(params[:user])
     @user.set_defaults
@@ -17,20 +17,15 @@ class UserController < ApplicationController
       render :action => 'new'
     end
   end
-  
+
   def rename
-    new_name = params['display_name']
-    if @user
-      @user.display_name = new_name
+    if params[:user] and params[:user][:display_name]
+      @user.display_name = params[:user][:display_name]
       if @user.save
         flash[:notice] = "User display name updated OK."
-      else
-        flash[:notice] = "Rename failed: #{ @user.errors.full_messages.join('; ') }."
+        redirect_to :controller => 'user', :action => 'account'
       end
-    else
-      flash[:notice] = 'not logged in'
     end
-    redirect_to :back
   end
 
   def lost_password