From efaed060d9fcc35ed0db2685c6531c548fa4ad1e Mon Sep 17 00:00:00 2001
From: Christophe Vilayphiou <chris.vilayphiou@gmail.com>
Date: Tue, 14 Aug 2012 15:11:52 +0800
Subject: [PATCH] Change for date

---
 .../panel/announcement/back_end/bulletins_controller.rb     | 3 ++-
 .../back_end/bulletins/_quick_edit_basic.html.erb           | 4 ++--
 .../panel/news/back_end/news_bulletins_controller.rb        | 6 ++++--
 .../news/back_end/news_bulletins/_quick_edit_basic.html.erb | 4 ++--
 4 files changed, 10 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 5500835b..a3213447 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
@@ -300,13 +300,14 @@ class Panel::Announcement::BackEnd::BulletinsController < OrbitBackendController
   
   protected
   
-  def delete_out_invalid_date_from_params()
+  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?) 
       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)")
+      @bulletin.deadline = nil
     end rescue nil
   end
 
diff --git a/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_quick_edit_basic.html.erb b/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_quick_edit_basic.html.erb
index 1d4c4f71..0870d9c4 100644
--- a/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_quick_edit_basic.html.erb
+++ b/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_quick_edit_basic.html.erb
@@ -25,13 +25,13 @@
 		<div class="control-group">
 			<label class="control-label"><%= t(:start) %></label>
 			<div class="controls">
-				<%= f.datetime_select :postdate, {}, :class => 'input-small' %>
+				<%= f.datetime_select :postdate, { :use_month_numbers => true, :order => [:day, :month, :year] }, :class => 'input-small' %>
 			</div>
 		</div>
 		<div class="control-group">
 			<label class="control-label"><%= t(:end) %></label>
 			<div class="controls">
-				<%= f.datetime_select :deadline, {}, :class => 'input-small' %>
+				<%= f.datetime_select :deadline, { :use_month_numbers => true, :prompt => { :month => 'Month', :day => 'Day', :year => 'Year'}, :order => [:day, :month, :year] }, :class => 'input-small' %>
 			</div>
 		</div>
 	</div>
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 d31790d5..33d55826 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
@@ -335,12 +335,14 @@ class Panel::News::BackEnd::NewsBulletinsController < OrbitBackendController
   end
 
   
-protected
-  def delete_out_invalid_date_from_params()
+  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?) 
       params[:news_bulletin].delete("deadline(1i)")
       params[:news_bulletin].delete("deadline(2i)")
       params[:news_bulletin].delete("deadline(3i)")
+      @news_bulletin.deadline = nil
     end rescue nil
   end
   
diff --git a/vendor/built_in_modules/news/app/views/panel/news/back_end/news_bulletins/_quick_edit_basic.html.erb b/vendor/built_in_modules/news/app/views/panel/news/back_end/news_bulletins/_quick_edit_basic.html.erb
index 182a4d81..084421cc 100644
--- a/vendor/built_in_modules/news/app/views/panel/news/back_end/news_bulletins/_quick_edit_basic.html.erb
+++ b/vendor/built_in_modules/news/app/views/panel/news/back_end/news_bulletins/_quick_edit_basic.html.erb
@@ -25,13 +25,13 @@
 		<div class="control-group">
 			<label class="control-label"><%= t(:start) %></label>
 			<div class="controls">
-				<%= f.date_select :postdate, {}, :class => 'input-small' %>
+				<%= f.date_select :postdate, { :use_month_numbers => true, :order => [:day, :month, :year] }, :class => 'input-small' %>
 			</div>
 		</div>
 		<div class="control-group">
 			<label class="control-label"><%= t(:end) %></label>
 			<div class="controls">
-				<%= f.date_select :deadline, {}, :class => 'input-small' %>
+				<%= f.date_select :deadline, { :use_month_numbers => true, :prompt => { :month => 'Month', :day => 'Day', :year => 'Year'}, :order => [:day, :month, :year] }, :class => 'input-small' %>
 			</div>
 		</div>
 	</div>