From 528c7da7239fa47bd0d393ddec6c4a0313eda3ca Mon Sep 17 00:00:00 2001 From: manson Date: Mon, 9 Jun 2014 10:01:53 +0800 Subject: [PATCH] update can_display scope for status is_top and sort_number --- app/controllers/archives_controller.rb | 4 ++-- app/models/archive_file.rb | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/app/controllers/archives_controller.rb b/app/controllers/archives_controller.rb index e0deeb7..945e793 100644 --- a/app/controllers/archives_controller.rb +++ b/app/controllers/archives_controller.rb @@ -17,7 +17,7 @@ class ArchivesController < ApplicationController end end cats = @categories.collect do |cat| - archives = ArchiveFile.where(:category_id => cat["id"]).collect do |archive| + archives = ArchiveFile.can_display.where(:category_id => cat["id"]).collect do |archive| statuses = archive.statuses.collect do |status| { "archive-status" => status @@ -65,7 +65,7 @@ class ArchivesController < ApplicationController end end cats = @categories.collect do |cat| - archives = ArchiveFile.where(:category_id => cat["id"]).collect do |archive| + archives = ArchiveFile.can_display.where(:category_id => cat["id"]).collect do |archive| { "archive-title" => archive.title, "archive_url" => OrbitHelper.widget_more_url diff --git a/app/models/archive_file.rb b/app/models/archive_file.rb index 90db6cf..fb7ed29 100644 --- a/app/models/archive_file.rb +++ b/app/models/archive_file.rb @@ -27,6 +27,7 @@ class ArchiveFile field :rss2_sn # scope :can_display,where(is_hidden: false) + scope :can_display, ->{where(is_hidden: false).asc(:sort_number, :title).desc(:is_top)} # belongs_to :archive_file_category