X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/f9baf5f392370318966c9392e3badbbd715592ad..60a294c40e341af16fa2eac6de5df2b0917a74be:/app/controllers/user_controller.rb diff --git a/app/controllers/user_controller.rb b/app/controllers/user_controller.rb index 9fd20f2ff..5b370334c 100644 --- 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, :api_details, :api_gpx_files] - before_filter :authorize_web, :only => [:edit, :account, :go_public, :view] - before_filter :require_user, :only => [:edit, :account, :go_public] - + before_filter :authorize_web, :only => [:edit, :account, :go_public, :view, :diary] + before_filter :require_user, :only => [:edit, :set_home, :account, :go_public] + def save @user = User.new(params[:user]) @user.set_defaults @@ -20,8 +20,13 @@ class UserController < ApplicationController def edit if params[:user] and params[:user][:display_name] and params[:user][:description] + home_lat = params[:user][:home_lat] + home_lon = params[:user][:home_lon] + @user.display_name = params[:user][:display_name] @user.description = params[:user][:description] + @user.home_lat = home_lat.to_f + @user.home_lon = home_lon.to_f if @user.save flash[:notice] = "User edited OK." redirect_to :controller => 'user', :action => 'account' @@ -29,6 +34,17 @@ class UserController < ApplicationController end end + def set_home + if params[:user][:home_lat] and params[:user][:home_lon] + @user.home_lat = params[:user][:home_lat].to_f + @user.home_lon = params[:user][:home_lon].to_f + if @user.save + flash[:notice] = "User home saved." + redirect_to :controller => 'user', :action => 'account' + end + end + end + def go_public @user.data_public = true @user.save @@ -139,11 +155,14 @@ class UserController < ApplicationController 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