Merge pull request #1494 from Br3nda/fix/ordering

More ordering fixes
This commit is contained in:
Daniel O'Connor
2017-12-15 12:57:08 +10:30
committed by GitHub
4 changed files with 4 additions and 3 deletions

View File

@@ -26,6 +26,7 @@ class Planting < ActiveRecord::Base
scope :finished, -> { where(finished: true) }
scope :current, -> { where(finished: false) }
scope :interesting, -> { has_photos.one_per_owner }
scope :recent, -> { order(created_at: :desc) }
scope :one_per_owner, lambda {
joins("JOIN members m ON (m.id=plantings.owner_id)
LEFT OUTER JOIN plantings p2

View File

@@ -43,7 +43,7 @@ class Post < ActiveRecord::Base
# return posts sorted by recent activity
def self.recently_active
Post.all.sort do |a, b|
Post.order(created_at: :desc).sort do |a, b|
b.recent_activity <=> a.recent_activity
end
end

View File

@@ -14,7 +14,7 @@
.col-md-4.hidden-xs
- cache cache_key_for(Planting) do
%h2= t('.recently_planted')
= render partial: 'plantings/list', locals: { plantings: Planting.includes(:owner, :photos).interesting.first(6) }
= render 'plantings/list', plantings: Planting.includes(:owner, :photos).interesting.recent.first(6)
.row
.col-md-12

View File

@@ -2,7 +2,7 @@
- posts = Post.limit(6)
- if posts
= render partial: "posts/summary", locals: { posts: posts, howmany: 6 }
= render "posts/summary", posts: posts, howmany: 6
- cache cache_key_for(Forum) do
- forums = Forum.all.order(:name)