X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/01cfcbd845c5d8d33f83bb22a24cf35932da2e29..1cf9e2ed19b5190e8c4bd2b0c07be4b56097a935:/app/controllers/user_controller.rb

diff --git a/app/controllers/user_controller.rb b/app/controllers/user_controller.rb
index f3ec2e243..3837d0976 100644
--- a/app/controllers/user_controller.rb
+++ b/app/controllers/user_controller.rb
@@ -2,8 +2,8 @@ class UserController < ApplicationController
   layout 'site'
 
   before_filter :authorize, :only => [:preferences, :api_details, :api_gpx_files]
-  before_filter :authorize_web, :only => [:rename, :account, :go_public]
-  before_filter :require_user, :only => [:rename, :account, :go_public]
+  before_filter :authorize_web, :only => [:edit, :account, :go_public, :view, :diary]
+  before_filter :require_user, :only => [:edit, :account, :go_public]
  
   def save
     @user = User.new(params[:user])
@@ -18,11 +18,12 @@ class UserController < ApplicationController
     end
   end
 
-  def rename
-    if params[:user] and params[:user][:display_name]
+  def edit
+    if params[:user] and params[:user][:display_name] and params[:user][:description]
       @user.display_name = params[:user][:display_name]
+      @user.description = params[:user][:description]
       if @user.save
-        flash[:notice] = "User display name updated OK."
+        flash[:notice] = "User edited OK."
         redirect_to :controller => 'user', :action => 'account'
       end
     end
@@ -137,5 +138,15 @@ class UserController < ApplicationController
     end
     render :text => doc.to_s
   end
+
+  def view
+    @this_user = User.find_by_display_name(params[:display_name])
+  end
+
+  def diary
+    @this_user = User.find_by_display_name(params[:display_name])
+  end
+
+
 end