diff --git a/vendor/built_in_modules/announcement/app/controllers/panel/announcement/back_end/bulletins_controller.rb b/vendor/built_in_modules/announcement/app/controllers/panel/announcement/back_end/bulletins_controller.rb index 7a90af22..d3f83c65 100644 --- a/vendor/built_in_modules/announcement/app/controllers/panel/announcement/back_end/bulletins_controller.rb +++ b/vendor/built_in_modules/announcement/app/controllers/panel/announcement/back_end/bulletins_controller.rb @@ -64,7 +64,7 @@ class Panel::Announcement::BackEnd::BulletinsController < OrbitBackendController # GET /bulletins/1/edit def edit @bulletin = Bulletin.find(params[:id]) - if !current_user.admin? && (@bulletin.is_rejected? || @bulletin.is_checked?) + if !(is_manager? || is_admin?) redirect_to :action => :index else # @summary_variable = @bulletin.summary_variable @@ -84,11 +84,11 @@ class Panel::Announcement::BackEnd::BulletinsController < OrbitBackendController @bulletin.create_user_id = current_user.id @bulletin.update_user_id = current_user.id - if(is_manager? || is_admin?) - @bulletin.is_checked = true - @bulletin.is_rejected = false - @bulletin.de_pending - end + # if(is_manager? || is_admin?) + # @bulletin.is_checked = true + # @bulletin.is_rejected = false + # @bulletin.de_pending + # end respond_to do |format| if @bulletin.save @@ -132,11 +132,11 @@ class Panel::Announcement::BackEnd::BulletinsController < OrbitBackendController respond_to do |format| if @bulletin.update_attributes(params[:bulletin]) - if(is_manager? || is_admin?) - @bulletin.is_checked = true - @bulletin.is_rejected = false - @bulletin.de_pending! - end + # if(is_manager? || is_admin?) + # @bulletin.is_checked = true + # @bulletin.is_rejected = false + # @bulletin.de_pending! + # end # if (params[:bulletin][:is_checked] == "false") # @bulletin.is_rejected = true # @bulletin.save! diff --git a/vendor/built_in_modules/announcement/app/models/bulletin.rb b/vendor/built_in_modules/announcement/app/models/bulletin.rb index 80ab2e0b..3ba8010e 100644 --- a/vendor/built_in_modules/announcement/app/models/bulletin.rb +++ b/vendor/built_in_modules/announcement/app/models/bulletin.rb @@ -8,7 +8,7 @@ class Bulletin include OrbitCategory::Categorizable include OrbitCoreLib::Preview - include OrbitModel::Approval + # include OrbitModel::Approval include OrbitModel::LanguageRestrict include OrbitModel::Status include OrbitModel::TimeFrame @@ -56,7 +56,8 @@ class Bulletin # a # end boolean :frontend_search do - ( !is_hidden && !is_pending && is_checked && !is_rejected ) + # ( !is_hidden && !is_pending && is_checked && !is_rejected ) + (!is_hidden) end integer :view_count diff --git a/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_form.html.erb b/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_form.html.erb index 064bdf13..12730759 100644 --- a/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_form.html.erb +++ b/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_form.html.erb @@ -18,11 +18,6 @@
- <% if @bulletin.is_rejected %> -
- <%= t(:rejected_reason) %> <%= @bulletin.not_checked_reason rescue t("rejected_reason_empty") %> -
- <% end %>