From bcc13a47e611dbf04d82f7543f0ef062e500611d Mon Sep 17 00:00:00 2001 From: Christophe Vilayphiou Date: Tue, 14 Aug 2012 16:23:34 +0800 Subject: [PATCH] Fix deadline was set to nil when update --- .../panel/announcement/back_end/bulletins_controller.rb | 2 +- .../panel/news/back_end/news_bulletins_controller.rb | 2 +- 2 files changed, 2 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 a3213447..c013d7f4 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 @@ -301,7 +301,7 @@ class Panel::Announcement::BackEnd::BulletinsController < OrbitBackendController protected def delete_out_invalid_date_from_params - if(params[:bulletin]["deadline(1i)"].blank? or params[:bulletin]["deadline(2i)"].blank? or params[:bulletin]["deadline(3i)"].blank?) + if((params[:bulletin]["deadline(1i)"] && params[:bulletin]["deadline(1i)"].blank?) or (params[:bulletin]["deadline(2i)"] && params[:bulletin]["deadline(2i)"].blank?) or (params[:bulletin]["deadline(3i)"] && params[:bulletin]["deadline(3i)"].blank?)) params[:bulletin].delete("deadline(1i)") params[:bulletin].delete("deadline(2i)") params[:bulletin].delete("deadline(3i)") 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 33d55826..a3942612 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 @@ -338,7 +338,7 @@ class Panel::News::BackEnd::NewsBulletinsController < OrbitBackendController protected def delete_out_invalid_date_from_params - if(params[:news_bulletin]["deadline(1i)"].blank? or params[:news_bulletin]["deadline(2i)"].blank? or params[:news_bulletin]["deadline(3i)"].blank?) + if((params[:news_bulletin]["deadline(1i)"] && params[:news_bulletin]["deadline(1i)"].blank?) or (params[:news_bulletin]["deadline(2i)"] && params[:news_bulletin]["deadline(2i)"].blank?) or (params[:news_bulletin]["deadline(3i)"] && params[:news_bulletin]["deadline(3i)"].blank?)) params[:news_bulletin].delete("deadline(1i)") params[:news_bulletin].delete("deadline(2i)") params[:news_bulletin].delete("deadline(3i)")