diff --git a/app/controllers/admin/announcements_controller.rb b/app/controllers/admin/announcements_controller.rb index fa0ec6c..d19c1b3 100644 --- a/app/controllers/admin/announcements_controller.rb +++ b/app/controllers/admin/announcements_controller.rb @@ -60,9 +60,11 @@ class Admin::AnnouncementsController < OrbitAdminController @table_fields = [:status, :category, :title, :start_date, :end_date, "announcement.comment", :last_modified] setting = AnnouncementSetting.first @annc_depts = [] + @enable_annc_dept = false if (setting.enable_annc_dept rescue false) @table_fields.insert(1, "announcement.annc_dept") @annc_depts = setting.annc_depts + @enable_annc_dept = true end @current_user = current_user if setting.is_display_edit_only && !current_user.is_admin? && !current_user.is_manager?(@module_app) diff --git a/app/views/admin/announcements/_index.html.erb b/app/views/admin/announcements/_index.html.erb index 39536cf..0f684a2 100644 --- a/app/views/admin/announcements/_index.html.erb +++ b/app/views/admin/announcements/_index.html.erb @@ -16,9 +16,11 @@