From d9f6bb3b4e86546b8f87f03018384bc121482fa5 Mon Sep 17 00:00:00 2001 From: "Matthew K. Fu JuYuan" Date: Wed, 15 Aug 2012 11:34:19 +0800 Subject: [PATCH] can display scope --- vendor/built_in_modules/announcement/app/models/bulletin.rb | 2 +- vendor/built_in_modules/news/app/models/news_bulletin.rb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/vendor/built_in_modules/announcement/app/models/bulletin.rb b/vendor/built_in_modules/announcement/app/models/bulletin.rb index e8716b32..352db55c 100644 --- a/vendor/built_in_modules/announcement/app/models/bulletin.rb +++ b/vendor/built_in_modules/announcement/app/models/bulletin.rb @@ -43,7 +43,7 @@ class Bulletin field :public, :type => Boolean, :default => true - scope :can_display,where(is_checked: true) + scope :can_display,all_of(is_checked: true,is_rejected: false,is_pending: false) scope :available_for_lang, ->(locale){ where("available_for_#{locale}".to_sym => true) } mount_uploader :image, ImageUploader diff --git a/vendor/built_in_modules/news/app/models/news_bulletin.rb b/vendor/built_in_modules/news/app/models/news_bulletin.rb index 7dac0869..eeabbcab 100644 --- a/vendor/built_in_modules/news/app/models/news_bulletin.rb +++ b/vendor/built_in_modules/news/app/models/news_bulletin.rb @@ -43,7 +43,7 @@ class NewsBulletin field :public, :type => Boolean, :default => true - scope :can_display,where(is_checked: true) + scope :can_display,all_of(is_checked: true,is_rejected: false,is_pending: false) scope :available_for_lang, ->(locale){ where("available_for_#{locale}".to_sym => true) } mount_uploader :image, ImageUploader