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

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

diff --git a/app/controllers/diary_entries_controller.rb b/app/controllers/diary_entries_controller.rb
index 4cdc1b55a817cb740b83d8920f7f0698327e9d05..8da0842eb09cbee7942cf28d725d5ee6b49e9308 100644 (file)
--- a/app/controllers/diary_entries_controller.rb
+++ b/app/controllers/diary_entries_controller.rb
@@ -1,4 +1,7 @@
 class DiaryEntriesController < ApplicationController
 class DiaryEntriesController < ApplicationController

+  include UserMethods
+  include PaginationMethods
+

   layout "site", :except => :rss
 
   before_action :authorize_web
   layout "site", :except => :rss
 
   before_action :authorize_web


@@ -17,7 +20,7 @@ class DiaryEntriesController < ApplicationController
 
       if @user
         @title = t ".user_title", :user => @user.display_name
 
       if @user
         @title = t ".user_title", :user => @user.display_name

-        @entries = @user.diary_entries
+        entries = @user.diary_entries

       else
         render_unknown_user params[:display_name]
         return
       else
         render_unknown_user params[:display_name]
         return


@@ -25,7 +28,7 @@ class DiaryEntriesController < ApplicationController
     elsif params[:friends]
       if current_user
         @title = t ".title_friends"
     elsif params[:friends]
       if current_user
         @title = t ".title_friends"

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

       else
         require_user
         return
       else
         require_user
         return


@@ -33,36 +36,35 @@ class DiaryEntriesController < ApplicationController
     elsif params[:nearby]
       if current_user
         @title = t ".title_nearby"
     elsif params[:nearby]
       if current_user
         @title = t ".title_nearby"

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

       else
         require_user
         return
       end
     else
       else
         require_user
         return
       end
     else

-      @entries = DiaryEntry.joins(:user).where(:users => { :status => %w[active confirmed] })
+      entries = DiaryEntry.joins(:user).where(:users => { :status => %w[active confirmed] })

 
       if params[:language]
         @title = t ".in_language_title", :language => Language.find(params[:language]).english_name
 
       if params[:language]
         @title = t ".in_language_title", :language => Language.find(params[:language]).english_name

-        @entries = @entries.where(:language_code => params[:language])
+        entries = entries.where(:language_code => params[:language])

       else
       else

+        candidate_codes = preferred_languages.flat_map(&:candidates).uniq.map(&:to_s)
+        @languages = Language.where(:code => candidate_codes).in_order_of(:code, candidate_codes)

         @title = t ".title"
       end
     end
 
         @title = t ".title"
       end
     end
 

-    @params = params.permit(:display_name, :friends, :nearby, :language)
+    entries = entries.visible unless can? :unhide, DiaryEntry

 
 

-    @page = (params[:page] || 1).to_i
-    @page_size = 20
+    @params = params.permit(:display_name, :friends, :nearby, :language)

 
 

-    @entries = @entries.visible unless can? :unhide, DiaryEntry
-    @entries = @entries.order("created_at DESC")
-    @entries = @entries.offset((@page - 1) * @page_size)
-    @entries = @entries.limit(@page_size)
-    @entries = @entries.includes(:user, :language)
+    @entries, @newer_entries_id, @older_entries_id = get_page_items(entries, :includes => [:user, :language])

   end
 
   def show
   end
 
   def show

-    @entry = @user.diary_entries.visible.where(:id => params[:id]).first
+    entries = @user.diary_entries
+    entries = entries.visible unless can? :unhide, DiaryEntry
+    @entry = entries.find_by(:id => params[:id])

     if @entry
       @title = t ".title", :user => params[:display_name], :title => @entry.title
       @comments = can?(:unhidecomment, DiaryEntry) ? @entry.comments : @entry.visible_comments
     if @entry
       @title = t ".title", :user => params[:display_name], :title => @entry.title
       @comments = can?(:unhidecomment, DiaryEntry) ? @entry.comments : @entry.visible_comments


@@ -75,7 +77,7 @@ class DiaryEntriesController < ApplicationController
   def new
     @title = t ".title"
 
   def new
     @title = t ".title"
 

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

     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
     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


@@ -100,7 +102,7 @@ class DiaryEntriesController < ApplicationController
     @diary_entry.user = current_user
 
     if @diary_entry.save
     @diary_entry.user = current_user
 
     if @diary_entry.save

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

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


@@ -156,21 +158,25 @@ class DiaryEntriesController < ApplicationController
   end
 
   def subscribe
   end
 
   def subscribe

-    diary_entry = DiaryEntry.find(params[:id])
+    @diary_entry = DiaryEntry.find(params[:id])

 
 

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

 
 

-    redirect_to diary_entry_path(diary_entry.user, diary_entry)
+      redirect_to diary_entry_path(@diary_entry.user, @diary_entry)
+    end

   rescue ActiveRecord::RecordNotFound
     render :action => "no_such_entry", :status => :not_found
   end
 
   def unsubscribe
   rescue ActiveRecord::RecordNotFound
     render :action => "no_such_entry", :status => :not_found
   end
 
   def unsubscribe

-    diary_entry = DiaryEntry.find(params[:id])
+    @diary_entry = DiaryEntry.find(params[:id])

 
 

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

 
 

-    redirect_to diary_entry_path(diary_entry.user, diary_entry)
+      redirect_to diary_entry_path(@diary_entry.user, @diary_entry)
+    end

   rescue ActiveRecord::RecordNotFound
     render :action => "no_such_entry", :status => :not_found
   end
   rescue ActiveRecord::RecordNotFound
     render :action => "no_such_entry", :status => :not_found
   end


@@ -236,15 +242,12 @@ class DiaryEntriesController < ApplicationController
   def comments
     @title = t ".title", :user => @user.display_name
 
   def comments
     @title = t ".title", :user => @user.display_name
 

-    conditions = { :user_id => @user }
+    comments = DiaryComment.where(:user => @user)
+    comments = comments.visible unless can? :unhidecomment, DiaryEntry

 
 

-    conditions[:visible] = true unless can? :unhidecomment, DiaryEntry
+    @params = params.permit(:display_name, :before, :after)

 
 

-    @comment_pages, @comments = paginate(:diary_comments,
-                                         :conditions => conditions,
-                                         :order => "created_at DESC",
-                                         :per_page => 20)
-    @page = (params[:page] || 1).to_i
+    @comments, @newer_comments_id, @older_comments_id = get_page_items(comments, :includes => [:user])

   end
 
   private
   end
 
   private


@@ -270,7 +273,7 @@ class DiaryEntriesController < ApplicationController
       @lon = @diary_entry.longitude
       @lat = @diary_entry.latitude
       @zoom = 12
       @lon = @diary_entry.longitude
       @lat = @diary_entry.latitude
       @zoom = 12

-    elsif current_user.home_lat.nil? || current_user.home_lon.nil?
+    elsif !current_user.home_location?

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