Fixed up name search and postcode search

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

diff --git a/app/controllers/user_controller.rb b/app/controllers/user_controller.rb
index 6561d46fb1ee00952be9a1094da472ba25d789fb..b2ac3072cae18d3e30c52978576b24aba2bf685d 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
-  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,16 +18,29 @@ 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
   end
 
+  def set_home
+    if params[:user][:home_lat] and params[:user][:home_lon]
+    lat = params[:user][:home_lat]
+    lon = params[:user][:home_lon]
+    unless 
+      #check the lat and lon
+    end
+    #make an api request to insert a new node
+    #get the onde id
+    end
+    end
+
   def go_public
     @user.data_public = true
     @user.save
@@ -125,5 +138,27 @@ class UserController < ApplicationController
       render :status => 400, :nothing => true
     end
   end
+
+  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