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

[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 8e6215dbd2726a8a8356cd71eaa9c90be91011c1..ea9aacb21d97f5e72b18e95fc3e28635cf89d903 100644 (file)
--- a/app/controllers/diary_entries_controller.rb
+++ b/app/controllers/diary_entries_controller.rb
@@ -16,55 +16,65 @@ class DiaryEntriesController < ApplicationController
       @user = User.active.find_by(:display_name => params[:display_name])
 
       if @user
-        @title = t "diary_entries.index.user_title", :user => @user.display_name
-        @entries = @user.diary_entries
+        @title = t ".user_title", :user => @user.display_name
+        entries = @user.diary_entries
       else
         render_unknown_user params[:display_name]
         return
       end
     elsif params[:friends]
       if current_user
-        @title = t "diary_entries.index.title_friends"
-        @entries = DiaryEntry.where(:user_id => current_user.friends)
+        @title = t ".title_friends"
+        entries = DiaryEntry.where(:user_id => current_user.friends)
       else
         require_user
         return
       end
     elsif params[:nearby]
       if current_user
-        @title = t "diary_entries.index.title_nearby"
-        @entries = DiaryEntry.where(:user_id => current_user.nearby)
+        @title = t ".title_nearby"
+        entries = DiaryEntry.where(:user_id => current_user.nearby)
       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 "diary_entries.index.in_language_title", :language => Language.find(params[:language]).english_name
-        @entries = @entries.where(:language_code => params[:language])
+        @title = t ".in_language_title", :language => Language.find(params[:language]).english_name
+        entries = entries.where(:language_code => params[:language])
       else
-        @title = t "diary_entries.index.title"
+        @title = t ".title"
       end
     end
 
+    entries = entries.visible unless can? :unhide, DiaryEntry
+
     @params = params.permit(:display_name, :friends, :nearby, :language)
 
-    @page = (params[:page] || 1).to_i
-    @page_size = 20
+    @entries = if params[:before]
+                 entries.where("diary_entries.id < ?", params[:before]).order(:id => :desc)
+               elsif params[:after]
+                 entries.where("diary_entries.id > ?", params[:after]).order(:id => :asc)
+               else
+                 entries.order(:id => :desc)
+               end
 
-    @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.limit(20)
     @entries = @entries.includes(:user, :language)
+    @entries = @entries.sort.reverse
+
+    @newer_entries = @entries.count.positive? && entries.exists?(["diary_entries.id > ?", @entries.first.id])
+    @older_entries = @entries.count.positive? && entries.exists?(["diary_entries.id < ?", @entries.last.id])
   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.where(:id => params[:id]).first
     if @entry
-      @title = t "diary_entries.show.title", :user => params[:display_name], :title => @entry.title
+      @title = t ".title", :user => params[:display_name], :title => @entry.title
       @comments = can?(:unhidecomment, DiaryEntry) ? @entry.comments : @entry.visible_comments
     else
       @title = t "diary_entries.no_such_entry.title", :id => params[:id]
@@ -73,7 +83,7 @@ class DiaryEntriesController < ApplicationController
   end
 
   def new
-    @title = t "diary_entries.new.title"
+    @title = t ".title"
 
     default_lang = current_user.preferences.where(:k => "diary.default_language").first
     lang_code = default_lang ? default_lang.v : current_user.preferred_language
@@ -83,7 +93,7 @@ class DiaryEntriesController < ApplicationController
   end
 
   def edit
-    @title = t "diary_entries.edit.title"
+    @title = t ".title"
     @diary_entry = DiaryEntry.find(params[:id])
 
     redirect_to diary_entry_path(@diary_entry.user, @diary_entry) if current_user != @diary_entry.user