From edcef5a8f742aeecb109c465427c5db66810af6b Mon Sep 17 00:00:00 2001 From: "Matthew K. Fu JuYuan" Date: Mon, 1 Oct 2012 16:11:58 +0800 Subject: [PATCH] make manager's news and announcement can be shown at once it be submitted. --- .../panel/announcement/back_end/bulletins_controller.rb | 4 +++- .../panel/news/back_end/news_bulletins_controller.rb | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) 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 e2f1384c..fb3acfdc 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 @@ -138,7 +138,9 @@ 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.de_pending + @bulletin.is_checked = true + @bulletin.is_rejected = false + @bulletin.de_pending end respond_to do |format| diff --git a/vendor/built_in_modules/news/app/controllers/panel/news/back_end/news_bulletins_controller.rb b/vendor/built_in_modules/news/app/controllers/panel/news/back_end/news_bulletins_controller.rb index 26e955d7..0ac5f81f 100644 --- a/vendor/built_in_modules/news/app/controllers/panel/news/back_end/news_bulletins_controller.rb +++ b/vendor/built_in_modules/news/app/controllers/panel/news/back_end/news_bulletins_controller.rb @@ -160,7 +160,9 @@ class Panel::News::BackEnd::NewsBulletinsController < OrbitBackendController @news_bulletin.update_user_id = current_user.id if(is_manager? || is_admin?) - @news_bulletin.de_pending + @news_bulletin.is_checked = true + @news_bulletin.is_rejected = false + @news_bulletin.de_pending end respond_to do |format|