orbit disable object for categories

2012-07-05 16:00:45 +08:00
1 parent edef51d58c
commit c5fdff764e
@@ -1,9 +1,10 @@
 class Panel::Announcement::BackEnd::BulletinCategorysController < OrbitBackendController
-
+  include OrbitControllerLib::DivisionForDisable
  before_filter :for_app_manager,:except => [:index] 
  
  def index
    @bulletin_categorys = BulletinCategory.all
+    #TODO 需要做 manager ,admin 才可以 all.  其他 available就好
    @bulletin_category = BulletinCategory.new(:display => 'List')
 	
 	@url = panel_announcement_back_end_bulletin_categorys_path
@@ -39,6 +39,7 @@ class Panel::Announcement::BackEnd::BulletinsController < OrbitBackendController
    # @bulletins = (params[:sort] || @filter) ? get_sorted_and_filtered_bulletins : Bulletin.all.page(params[:page]).per(10)
    @bulletins = (params[:sort] || @filter) ? get_sorted_and_filtered("bulletin") : get_viewable("bulletin")
  	@bulletin_categories = BulletinCategory.all
+    #TODO 需要做 manager ,admin 才可以 all.  其他 available就好

    @bulletin_link = BulletinLink.new
    @link_url = panel_announcement_back_end_bulletins_path
@@ -301,6 +302,8 @@ class Panel::Announcement::BackEnd::BulletinsController < OrbitBackendController
    @bulletin = Bulletin.find(params[:id])
    @type = params[:type]
    @bulletin_categories = BulletinCategory.all
+     #TODO 需要做 manager ,admin 才可以 all.  其他 available就好
+
    get_tags
  end

@@ -328,9 +331,9 @@ class Panel::Announcement::BackEnd::BulletinsController < OrbitBackendController
    @bulletin_categorys = []
    #@unit_list_for_anc = UnitListForAnc.all
    if(is_manager? || is_admin?)
-      @bulletin_categorys = (id ? BulletinCategory.available.find(id).to_a : BulletinCategory.available)
+      @bulletin_categorys = (id ? BulletinCategory.all.find(id).to_a : BulletinCategory.all)
    elsif is_sub_manager?
-      @bulletin_categorys = BulletinCategory.available.authed_for_user(current_user,'submit') 
+      @bulletin_categorys = BulletinCategory.all.authed_for_user(current_user,'submit') 
    end
    if @bulletin_categorys.empty? && params[:action] != "index"
        flash[:alert] = t("announcement.error.no_avilb_cate_for_posting")
@@ -52,7 +52,7 @@ class Panel::Announcement::Widget::BulletinsController < OrbitWidgetController
  protected
  
  def get_categorys
-    @bulletin_categorys = BulletinCategory.excludes('disabled' => true)
+    @bulletin_categorys = BulletinCategory.all
  end
  
 end
@@ -13,8 +13,4 @@ include ActionView::Helpers::UrlHelper
     link_to t('announcement.bulletin.cate_auth'),admin_object_auth_ob_auth_path(oa)
  end

-  def show_toggle_archive_btn(bulletin_category)
-    bulletin_category.disable ?  t("bulletin_category.disable_change_to_true") : t("bulletin_category.disable_change_to_false") 
-  end
-
 end
@@ -4,7 +4,8 @@ class BulletinCategory
  include Mongoid::Document
  include Mongoid::Timestamps
  include OrbitCoreLib::ObjectAuthable
-  
+  include OrbitCoreLib::ObjectDisable
+
  ObjectAuthTitlesOptions = %W{submit_new fact_check}
  AfterObjectAuthUrl = '/panel/announcement/back_end/bulletin_categorys'
  # include Mongoid::MultiParameterAttributes
@@ -20,15 +21,7 @@ class BulletinCategory
  
  has_many :bulletins
  
-  scope :available,where(disable: false)

-    def self.find(*args)
-      if args ==[:all]
-          unscoped
-        else
-          unscoped.find(args) 
-      end
-    end

  def pp_object
    i18n_variable[I18n.locale]
@@ -92,7 +92,7 @@ en:
    update_success: Bulletin Category Updated
    update_failed: Bulletin Category Failed
    disable_change_to_false: Toggle to archive
-    disable_change_to_true:  Pu back from archive
+    disable_change_to_true:  Put back from archive
  # admin:
  #     action: Action
  #     add_language: Add language
@@ -181,8 +181,6 @@ zh_tw:
    delete: 刪除  
    update_success: 分類更新成功
    update_failed: 分類更新失敗
-    disable_change_to_false: 設為停用
-    disable_change_to_true:  重新啓用
    
 # Chinese (Taiwan) translations for Ruby on Rails
 # by tsechingho (http://github.com/tsechingho)