Merge remote-tracking branch 'upstream/pull/1583'

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

diff --git a/app/controllers/diary_entry_controller.rb b/app/controllers/diary_entry_controller.rb
index 8863e2fd9f2de594797e9561af339acd13f753ab..b3518872c5aa067cbd2fdab073862affcd54979e 100644 (file)
--- a/app/controllers/diary_entry_controller.rb
+++ b/app/controllers/diary_entry_controller.rb
@@ -14,27 +14,27 @@ class DiaryEntryController < ApplicationController
 
     if request.post?
       @diary_entry = DiaryEntry.new(entry_params)
 
     if request.post?
       @diary_entry = DiaryEntry.new(entry_params)

-      @diary_entry.user = @user
+      @diary_entry.user = current_user

 
       if @diary_entry.save
 
       if @diary_entry.save

-        default_lang = @user.preferences.where(:k => "diary.default_language").first
+        default_lang = current_user.preferences.where(:k => "diary.default_language").first

         if default_lang
           default_lang.v = @diary_entry.language_code
           default_lang.save!
         else
         if default_lang
           default_lang.v = @diary_entry.language_code
           default_lang.save!
         else

-          @user.preferences.create(:k => "diary.default_language", :v => @diary_entry.language_code)
+          current_user.preferences.create(:k => "diary.default_language", :v => @diary_entry.language_code)

         end
 
         # Subscribe user to diary comments
         end
 
         # Subscribe user to diary comments

-        @diary_entry.subscriptions.create(:user => @user)
+        @diary_entry.subscriptions.create(:user => current_user)

 
 

-        redirect_to :action => "list", :display_name => @user.display_name
+        redirect_to :action => "list", :display_name => current_user.display_name

       else
         render :action => "edit"
       end
     else
       else
         render :action => "edit"
       end
     else

-      default_lang = @user.preferences.where(:k => "diary.default_language").first
-      lang_code = default_lang ? default_lang.v : @user.preferred_language
+      default_lang = current_user.preferences.where(:k => "diary.default_language").first
+      lang_code = default_lang ? default_lang.v : current_user.preferred_language

       @diary_entry = DiaryEntry.new(entry_params.merge(:language_code => lang_code))
       set_map_location
       render :action => "edit"
       @diary_entry = DiaryEntry.new(entry_params.merge(:language_code => lang_code))
       set_map_location
       render :action => "edit"


@@ -45,7 +45,7 @@ class DiaryEntryController < ApplicationController
     @title = t "diary_entry.edit.title"
     @diary_entry = DiaryEntry.find(params[:id])
 
     @title = t "diary_entry.edit.title"
     @diary_entry = DiaryEntry.find(params[:id])
 

-    if @user != @diary_entry.user
+    if current_user != @diary_entry.user

       redirect_to :action => "view", :id => params[:id]
     elsif params[:diary_entry] && @diary_entry.update_attributes(entry_params)
       redirect_to :action => "view", :id => params[:id]
       redirect_to :action => "view", :id => params[:id]
     elsif params[:diary_entry] && @diary_entry.update_attributes(entry_params)
       redirect_to :action => "view", :id => params[:id]


@@ -59,18 +59,18 @@ class DiaryEntryController < ApplicationController
   def comment
     @entry = DiaryEntry.find(params[:id])
     @diary_comment = @entry.comments.build(comment_params)
   def comment
     @entry = DiaryEntry.find(params[:id])
     @diary_comment = @entry.comments.build(comment_params)

-    @diary_comment.user = @user
+    @diary_comment.user = current_user

     if @diary_comment.save
 
       # Notify current subscribers of the new comment
       @entry.subscribers.visible.each do |user|
     if @diary_comment.save
 
       # Notify current subscribers of the new comment
       @entry.subscribers.visible.each do |user|

-        if @user != user
+        if current_user != user

           Notifier.diary_comment_notification(@diary_comment, user).deliver_now
         end
       end
 
       # Add the commenter to the subscribers if necessary
           Notifier.diary_comment_notification(@diary_comment, user).deliver_now
         end
       end
 
       # Add the commenter to the subscribers if necessary

-      @entry.subscriptions.create(:user => @user) unless @entry.subscribers.exists?(@user.id)
+      @entry.subscriptions.create(:user => current_user) unless @entry.subscribers.exists?(current_user.id)

 
       redirect_to :action => "view", :display_name => @entry.user.display_name, :id => @entry.id
     else
 
       redirect_to :action => "view", :display_name => @entry.user.display_name, :id => @entry.id
     else


@@ -83,7 +83,7 @@ class DiaryEntryController < ApplicationController
   def subscribe
     diary_entry = DiaryEntry.find(params[:id])
 
   def subscribe
     diary_entry = DiaryEntry.find(params[:id])
 

-    diary_entry.subscriptions.create(:user => @user) unless diary_entry.subscribers.exists?(@user.id)
+    diary_entry.subscriptions.create(:user => current_user) unless diary_entry.subscribers.exists?(current_user.id)

 
     redirect_to :action => "view", :display_name => diary_entry.user.display_name, :id => diary_entry.id
   rescue ActiveRecord::RecordNotFound
 
     redirect_to :action => "view", :display_name => diary_entry.user.display_name, :id => diary_entry.id
   rescue ActiveRecord::RecordNotFound


@@ -93,7 +93,7 @@ class DiaryEntryController < ApplicationController
   def unsubscribe
     diary_entry = DiaryEntry.find(params[:id])
 
   def unsubscribe
     diary_entry = DiaryEntry.find(params[:id])
 

-    diary_entry.subscriptions.where(:user => @user).delete_all if diary_entry.subscribers.exists?(@user.id)
+    diary_entry.subscriptions.where(:user => current_user).delete_all if diary_entry.subscribers.exists?(current_user.id)

 
     redirect_to :action => "view", :display_name => diary_entry.user.display_name, :id => diary_entry.id
   rescue ActiveRecord::RecordNotFound
 
     redirect_to :action => "view", :display_name => diary_entry.user.display_name, :id => diary_entry.id
   rescue ActiveRecord::RecordNotFound


@@ -112,17 +112,17 @@ class DiaryEntryController < ApplicationController
         return
       end
     elsif params[:friends]
         return
       end
     elsif params[:friends]

-      if @user
+      if current_user

         @title = t "diary_entry.list.title_friends"
         @title = t "diary_entry.list.title_friends"

-        @entries = DiaryEntry.where(:user_id => @user.friend_users)
+        @entries = DiaryEntry.where(:user_id => current_user.friend_users)

       else
         require_user
         return
       end
     elsif params[:nearby]
       else
         require_user
         return
       end
     elsif params[:nearby]

-      if @user
+      if current_user

         @title = t "diary_entry.list.title_nearby"
         @title = t "diary_entry.list.title_nearby"

-        @entries = DiaryEntry.where(:user_id => @user.nearby)
+        @entries = DiaryEntry.where(:user_id => current_user.nearby)

       else
         require_user
         return
       else
         require_user
         return


@@ -138,6 +138,8 @@ class DiaryEntryController < ApplicationController
       end
     end
 
       end
     end
 

+    @params = params.permit(:display_name, :friends, :nearby, :language)
+

     @page = (params[:page] || 1).to_i
     @page_size = 20
 
     @page = (params[:page] || 1).to_i
     @page_size = 20
 


@@ -158,7 +160,7 @@ class DiaryEntryController < ApplicationController
         @description = I18n.t("diary_entry.feed.user.description", :user => user.display_name)
         @link = "http://#{SERVER_URL}/user/#{user.display_name}/diary"
       else
         @description = I18n.t("diary_entry.feed.user.description", :user => user.display_name)
         @link = "http://#{SERVER_URL}/user/#{user.display_name}/diary"
       else

-        render :text => "", :status => :not_found
+        head :not_found

         return
       end
     else
         return
       end
     else


@@ -232,7 +234,7 @@ class DiaryEntryController < ApplicationController
   # require that the user is a administrator, or fill out a helpful error message
   # and return them to the user page.
   def require_administrator
   # require that the user is a administrator, or fill out a helpful error message
   # and return them to the user page.
   def require_administrator

-    unless @user.administrator?
+    unless current_user.administrator?

       flash[:error] = t("user.filter.not_an_administrator")
       redirect_to :action => "view"
     end
       flash[:error] = t("user.filter.not_an_administrator")
       redirect_to :action => "view"
     end


@@ -245,13 +247,13 @@ class DiaryEntryController < ApplicationController
       @lon = @diary_entry.longitude
       @lat = @diary_entry.latitude
       @zoom = 12
       @lon = @diary_entry.longitude
       @lat = @diary_entry.latitude
       @zoom = 12

-    elsif @user.home_lat.nil? || @user.home_lon.nil?
+    elsif current_user.home_lat.nil? || current_user.home_lon.nil?

       @lon = params[:lon] || -0.1
       @lat = params[:lat] || 51.5
       @zoom = params[:zoom] || 4
     else
       @lon = params[:lon] || -0.1
       @lat = params[:lat] || 51.5
       @zoom = params[:zoom] || 4
     else

-      @lon = @user.home_lon
-      @lat = @user.home_lat
+      @lon = current_user.home_lon
+      @lat = current_user.home_lat

       @zoom = 12
     end
   end
       @zoom = 12
     end
   end