Update the postcode code to do a npemap lookup, rather than a FTP one

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

diff --git a/app/controllers/user_controller.rb b/app/controllers/user_controller.rb
index 761468b988ddd2bada99763052e51c936e7c98d5..3837d097609512816176798d7d7339d72d011c8a 100644 (file)
--- a/app/controllers/user_controller.rb
+++ b/app/controllers/user_controller.rb
@@ -1,9 +1,9 @@
 class UserController < ApplicationController
   layout 'site'
 
-  before_filter :authorize, :only => [:preferences, :api_details]
-  before_filter :authorize_web, :only => [:rename, :account, :go_public]
-  before_filter :require_user, :only => [:rename, :account, :go_public]
+  before_filter :authorize, :only => [:preferences, :api_details, :api_gpx_files]
+  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
@@ -129,5 +130,23 @@ class UserController < ApplicationController
   def api_details
     render :text => @user.to_xml.to_s
   end
+
+  def api_gpx_files
+    doc = OSM::API.new.get_xml_doc
+    @user.traces.each do |trace|
+      doc.root << trace.to_xml_node() if trace.public? or trace.user == @user
+    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