resolved user.rb conflict

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

diff --git a/app/controllers/user_controller.rb b/app/controllers/user_controller.rb
index b2ac3072cae18d3e30c52978576b24aba2bf685d..60b83cc89f4d4d824fca7efd295bc2f0d585b7e5 100644 (file)
--- 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, :diary]
-  before_filter :require_user, :only => [:edit, :account, :go_public]
- 
+  before_filter :authorize_web, :only => [:edit, :account, :go_public, :view, :diary, :make_friend]
+  before_filter :require_user, :only => [:edit, :set_home, :account, :go_public, :make_friend]
+
   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'
@@ -31,15 +36,14 @@ class UserController < ApplicationController
 
   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
+      @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
@@ -49,7 +53,7 @@ class UserController < ApplicationController
   end
 
   def lost_password
-    if params['user']['email']
+    if params[:user][:email]
       user = User.find_by_email(params['user']['email'])
       if user
         user.token = User.make_token
@@ -159,6 +163,25 @@ class UserController < ApplicationController
     @this_user = User.find_by_display_name(params[:display_name])
   end
 
+  def make_friend
+
+    if params[:display_name]     
+      name = params[:display_name]
+      friend = Friend.new
+      friend.user_id = @user.id
+      friend.friend_user_id = User.find_by_display_name(name).id 
+      unless @user.is_friends_with?(friend)
+        if friend.save
+          flash[:notice] = "#{name} is now your friend"
+        else
+          friend.add_error("adding a friend failed")
+        end
+      else
+        flash[:notice] = "Your are already friends"  
+      end
+        redirect_to :controller => 'user', :action => 'view'
+    end
+  end
 
 end