X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/7dbc27fd672dc8649bf036334521aca4413ff09e..d1f2b4ece98b817696b9774953e53dfbfa6b9f52:/app/controllers/user_controller.rb diff --git a/app/controllers/user_controller.rb b/app/controllers/user_controller.rb index f279edd80..c399066ca 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 => [:api_details, :api_gpx_files] - before_filter :authorize_web, :only => [:account, :go_public, :view, :diary, :make_friend, :remove_friend] - before_filter :require_user, :only => [:set_home, :account, :go_public, :make_friend, :remove_friend] + before_filter :authorize_web, :only => [:account, :go_public, :view, :diary, :make_friend, :remove_friend, :upload_image] + before_filter :require_user, :only => [:set_home, :account, :go_public, :make_friend, :remove_friend, :upload_image] filter_parameter_logging :password, :pass_crypt, :pass_crypt_confirmation @@ -155,6 +155,12 @@ class UserController < ApplicationController end end + def upload_image + @user.image = params[:user][:image] + @user.save! + redirect_to :controller => 'user', :action => 'view', :display_name => @user.display_name + end + def api_details render :text => @user.to_xml.to_s, :content_type => "text/xml" end