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 83915435..c653d466 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,6 +64,7 @@ class Panel::Announcement::BackEnd::BulletinsController < OrbitBackendController # GET /bulletins/1/edit def edit @bulletin = Bulletin.find(params[:id]) + @tags = get_tags is_authorized_sub_manager = @bulletin.category.auth_sub_manager.authorized_user_ids rescue nil if !(is_manager? || is_admin? || is_authorized_sub_manager.include?(current_user.id)) @@ -121,7 +122,6 @@ class Panel::Announcement::BackEnd::BulletinsController < OrbitBackendController def update @bulletin = Bulletin.find(params[:id]) - # @bulletin.image.clear if params[:bulletin][:image_del] == '1' # if params[:bulletin][:image_del] == '1' # @bulletin.remove_image! @@ -129,11 +129,11 @@ class Panel::Announcement::BackEnd::BulletinsController < OrbitBackendController # params[:bulletin][:image_del] = nil # end - delete_out_invalid_date_from_params respond_to do |format| - if @bulletin.update_attributes(params[:bulletin]) + @bulletin.tagged_ids = @bulletin.tag_ids if params[:bulletin][:tag_ids].nil? + @bulletin.save # if(is_manager? || is_admin?) # @bulletin.is_checked = true # @bulletin.is_rejected = false