From 6c4c1046bc8421294850f1fb4f78cc2c5b1ef9c3 Mon Sep 17 00:00:00 2001 From: "Matthew K. Fu JuYuan" Date: Thu, 28 Jun 2012 15:19:51 +0800 Subject: [PATCH] fix date select cause error back to the time of Jesus --- .../back_end/bulletins_controller.rb | 27 ++++++++++++++----- 1 file changed, 20 insertions(+), 7 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 1dceb90e6..e2b8b7cff 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 @@ -76,7 +76,7 @@ class Panel::Announcement::BackEnd::BulletinsController < OrbitBackendController # GET /bulletins/new # GET /bulletins/new.xml def new - @bulletin = Bulletin.new + @bulletin = Bulletin.new(:postdate => DateTime.now) @link_url = panel_announcement_back_end_bulletins_path @@ -137,7 +137,7 @@ class Panel::Announcement::BackEnd::BulletinsController < OrbitBackendController else @bulletin = Bulletin.new(params[:bulletin]) - @bulletin.deadline = nil if (@bulletin.deadline < @bulletin.postdate rescue nil) + @bulletin.deadline = nil if (@bulletin.deadline < @bulletin.postdate rescue nil) @bulletin.create_user_id = current_user.id @bulletin.update_user_id = current_user.id @@ -216,7 +216,6 @@ class Panel::Announcement::BackEnd::BulletinsController < OrbitBackendController # PUT /bulletins/1 # PUT /bulletins/1.xml def update - if params[:bulletin_link] @bulletin_link = BulletinLink.find(params[:id]) @@ -246,9 +245,7 @@ class Panel::Announcement::BackEnd::BulletinsController < OrbitBackendController else @bulletin = Bulletin.find(params[:id]) - @bulletin.deadline = nil if (@bulletin.deadline < @bulletin.postdate rescue nil) - - @bulletin.update_user_id = current_user.id + # @bulletin.image.clear if params[:bulletin][:image_del] == '1' # if params[:bulletin][:image_del] == '1' @@ -256,9 +253,15 @@ class Panel::Announcement::BackEnd::BulletinsController < OrbitBackendController # @bulletin.image_del = nil # params[:bulletin][:image_del] = nil # end - + + delete_out_invalid_date_from_params respond_to do |format| if @bulletin.update_attributes(params[:bulletin]) + # if (@bulletin.deadline < @bulletin.postdate rescue nil) + # @bulletin.deadline = nil + # @bulletin.update_user_id = current_user.id + # @bulletin.save! + # end # format.html { redirect_to(panel_announcement_back_end_bulletin_url(@bulletin), :notice => t('bulletin.update_bulletin_success')) } format.html { redirect_to(panel_announcement_back_end_bulletins_url, :notice => t('bulletin.update_bulletin_success')) } format.js { render 'toggle_enable' } @@ -316,6 +319,16 @@ class Panel::Announcement::BackEnd::BulletinsController < OrbitBackendController protected + def delete_out_invalid_date_from_params() + if(params[:bulletin]["deadline(1i)"].empty? or params[:bulletin]["deadline(2i)"].empty? orparams[:bulletin]["deadline(3i)"].empty?) + params[:bulletin].delete("deadline(1i)") + params[:bulletin].delete("deadline(2i)") + params[:bulletin].delete("deadline(3i)") + params[:bulletin].delete("deadline(4i)") + params[:bulletin].delete("deadline(5i)") + end + end + def get_categorys(id = nil) @bulletin_categorys = [] #@unit_list_for_anc = UnitListForAnc.all