Pagination and sorting of digest by recency (#2374)

* paginate and sort * paginated for 100 items
publiclab · Feb 26, 2018 · b676b6b · b676b6b
1 parent c866602
commit b676b6b
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 0 deletions.
diff --git a/app/controllers/subscription_controller.rb b/app/controllers/subscription_controller.rb
@@ -112,6 +112,9 @@ def delete
 
   def digest
     @wikis = current_user.content_followed_in_period(Time.now - 1.week, Time.now)
+             .paginate(page: params[:page], per_page: 100)
+
+    @paginated = true
     render :template => "subscriptions/digest"
   end
 

diff --git a/app/models/user.rb b/app/models/user.rb
@@ -321,6 +321,7 @@ def content_followed_in_period(start_time, end_time)
         .includes(:revision, :tag)
         .references(:node_revision)
         .where("(created >= #{start_time.to_i} AND created <= #{end_time.to_i}) OR (timestamp >= #{start_time.to_i}  AND timestamp <= #{end_time.to_i})")
+        .order('node_revisions.timestamp DESC')
         .uniq
   end