Update to iD v1.7.1

[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 a611c19e9d90ef1d0d91acfa0ad8f9609e0b3c29..c0b6ece3843dca44b75a415059815e9c92b3e7bd 100644 (file)
--- a/app/controllers/diary_entry_controller.rb
+++ b/app/controllers/diary_entry_controller.rb
@@ -1,16 +1,16 @@
 class DiaryEntryController < ApplicationController
-  layout 'site', :except => :rss
+  layout "site", :except => :rss
 
-  before_filter :authorize_web
-  before_filter :set_locale
-  before_filter :require_user, :only => [:new, :edit, :comment, :hide, :hidecomment]
-  before_filter :lookup_this_user, :only => [:view, :comments]
-  before_filter :check_database_readable
-  before_filter :check_database_writable, :only => [:new, :edit]
-  before_filter :require_administrator, :only => [:hide, :hidecomment]
+  before_action :authorize_web
+  before_action :set_locale
+  before_action :require_user, :only => [:new, :edit, :comment, :hide, :hidecomment]
+  before_action :lookup_this_user, :only => [:view, :comments]
+  before_action :check_database_readable
+  before_action :check_database_writable, :only => [:new, :edit]
+  before_action :require_administrator, :only => [:hide, :hidecomment]
 
   def new
-    @title = t 'diary_entry.new.title'
+    @title = t "diary_entry.new.title"
 
     if params[:diary_entry]
       @diary_entry = DiaryEntry.new(entry_params)
@@ -24,27 +24,27 @@ class DiaryEntryController < ApplicationController
         else
           @user.preferences.create(:k => "diary.default_language", :v => @diary_entry.language_code)
         end
-        redirect_to :controller => 'diary_entry', :action => 'list', :display_name => @user.display_name
+        redirect_to :controller => "diary_entry", :action => "list", :display_name => @user.display_name
       else
-        render :action => 'edit'
+        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
       @diary_entry = DiaryEntry.new(:language_code => lang_code)
       set_map_location
-      render :action => 'edit'
+      render :action => "edit"
     end
   end
 
   def edit
-    @title= t 'diary_entry.edit.title'
+    @title = t "diary_entry.edit.title"
     @diary_entry = DiaryEntry.find(params[:id])
 
     if @user != @diary_entry.user
-      redirect_to :controller => 'diary_entry', :action => 'view', :id => params[:id]
-    elsif params[:diary_entry] and @diary_entry.update_attributes(entry_params)
-      redirect_to :controller => 'diary_entry', :action => 'view', :id => params[:id]
+      redirect_to :controller => "diary_entry", :action => "view", :id => params[:id]
+    elsif params[:diary_entry] && @diary_entry.update_attributes(entry_params)
+      redirect_to :controller => "diary_entry", :action => "view", :id => params[:id]
     end
 
     set_map_location
@@ -61,9 +61,9 @@ class DiaryEntryController < ApplicationController
         Notifier.diary_comment_notification(@diary_comment).deliver_now
       end
 
-      redirect_to :controller => 'diary_entry', :action => 'view', :display_name => @entry.user.display_name, :id => @entry.id
+      redirect_to :controller => "diary_entry", :action => "view", :display_name => @entry.user.display_name, :id => @entry.id
     else
-      render :action => 'view'
+      render :action => "view"
     end
   rescue ActiveRecord::RecordNotFound
     render :action => "no_such_entry", :status => :not_found
@@ -74,7 +74,7 @@ class DiaryEntryController < ApplicationController
       @this_user = User.active.find_by_display_name(params[:display_name])
 
       if @this_user
-        @title = t 'diary_entry.list.user_title', :user => @this_user.display_name
+        @title = t "diary_entry.list.user_title", :user => @this_user.display_name
         @entries = @this_user.diary_entries
       else
         render_unknown_user params[:display_name]
@@ -82,28 +82,28 @@ class DiaryEntryController < ApplicationController
       end
     elsif params[:friends]
       if @user
-        @title = t 'diary_entry.list.title_friends'
+        @title = t "diary_entry.list.title_friends"
         @entries = DiaryEntry.where(:user_id => @user.friend_users)
       else
-          require_user
-          return
+        require_user
+        return
       end
     elsif params[:nearby]
       if @user
-        @title = t 'diary_entry.list.title_nearby'
+        @title = t "diary_entry.list.title_nearby"
         @entries = DiaryEntry.where(:user_id => @user.nearby)
       else
-          require_user
-          return
+        require_user
+        return
       end
     else
-      @entries = DiaryEntry.joins(:user).where(:users => { :status => ["active", "confirmed"] })
+      @entries = DiaryEntry.joins(:user).where(:users => { :status => %w(active confirmed) })
 
       if params[:language]
-        @title = t 'diary_entry.list.in_language_title', :language => Language.find(params[:language]).english_name
+        @title = t "diary_entry.list.in_language_title", :language => Language.find(params[:language]).english_name
         @entries = @entries.where(:language_code => params[:language])
       else
-        @title = t 'diary_entry.list.title'
+        @title = t "diary_entry.list.title"
       end
     end
 
@@ -123,24 +123,24 @@ class DiaryEntryController < ApplicationController
 
       if user
         @entries = user.diary_entries
-        @title = I18n.t('diary_entry.feed.user.title', :user => user.display_name)
-        @description = I18n.t('diary_entry.feed.user.description', :user => user.display_name)
+        @title = I18n.t("diary_entry.feed.user.title", :user => user.display_name)
+        @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
         return
       end
     else
-      @entries = DiaryEntry.joins(:user).where(:users => { :status => ["active", "confirmed"] })
+      @entries = DiaryEntry.joins(:user).where(:users => { :status => %w(active confirmed) })
 
       if params[:language]
         @entries = @entries.where(:language_code => params[:language])
-        @title = I18n.t('diary_entry.feed.language.title', :language_name => Language.find(params[:language]).english_name)
-        @description = I18n.t('diary_entry.feed.language.description', :language_name => Language.find(params[:language]).english_name)
+        @title = I18n.t("diary_entry.feed.language.title", :language_name => Language.find(params[:language]).english_name)
+        @description = I18n.t("diary_entry.feed.language.description", :language_name => Language.find(params[:language]).english_name)
         @link = "http://#{SERVER_URL}/diary/#{params[:language]}"
       else
-        @title = I18n.t('diary_entry.feed.all.title')
-        @description = I18n.t('diary_entry.feed.all.description')
+        @title = I18n.t("diary_entry.feed.all.title")
+        @description = I18n.t("diary_entry.feed.all.description")
         @link = "http://#{SERVER_URL}/diary"
       end
     end
@@ -151,10 +151,10 @@ class DiaryEntryController < ApplicationController
   def view
     @entry = @this_user.diary_entries.visible.where(:id => params[:id]).first
     if @entry
-      @title = t 'diary_entry.view.title', :user => params[:display_name], :title => @entry.title
+      @title = t "diary_entry.view.title", :user => params[:display_name], :title => @entry.title
     else
-      @title = t 'diary_entry.no_such_entry.title', :id => params[:id]
-      render :action => 'no_such_entry', :status => :not_found
+      @title = t "diary_entry.no_such_entry.title", :id => params[:id]
+      render :action => "no_such_entry", :status => :not_found
     end
   end
 
@@ -176,11 +176,13 @@ class DiaryEntryController < ApplicationController
                                            :user_id => @this_user,
                                            :visible => true
                                          },
-                                         :order => 'created_at DESC',
+                                         :order => "created_at DESC",
                                          :per_page => 20)
     @page = (params[:page] || 1).to_i
   end
-private
+
+  private
+
   ##
   # return permitted diary entry parameters
   def entry_params
@@ -198,25 +200,19 @@ private
   # and return them to the user page.
   def require_administrator
     unless @user.administrator?
-      flash[:error] = t('user.filter.not_an_administrator')
-      redirect_to :controller => 'diary_entry', :action => 'view'
+      flash[:error] = t("user.filter.not_an_administrator")
+      redirect_to :controller => "diary_entry", :action => "view"
     end
   end
 
-  ##
-  # is this list user specific?
-  def user_specific_list?
-    params[:friends] or params[:nearby]
-  end
-
   ##
   # decide on a location for the diary entry map
   def set_map_location
-    if @diary_entry.latitude and @diary_entry.longitude
+    if @diary_entry.latitude && @diary_entry.longitude
       @lon = @diary_entry.longitude
       @lat = @diary_entry.latitude
       @zoom = 12
-    elsif @user.home_lat.nil? or @user.home_lon.nil?
+    elsif @user.home_lat.nil? || @user.home_lon.nil?
       @lon = params[:lon] || -0.1
       @lat = params[:lat] || 51.5
       @zoom = params[:zoom] || 4