developers
/
orbit-basic
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Change for date

This commit is contained in:
Christophe Vilayphiou 2012-08-14 15:11:52 +08:00
parent fb53ad524a
commit efaed060d9
4 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
vendor/built_in_modules/announcement/app/controllers/panel/announcement/back_end/bulletins_controller.rb vendored
View File

@ -300,13 +300,14 @@ class Panel::Announcement::BackEnd::BulletinsController < OrbitBackendController
protected 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?) 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(1i)")
params[:bulletin].delete("deadline(2i)") params[:bulletin].delete("deadline(2i)")
params[:bulletin].delete("deadline(3i)") params[:bulletin].delete("deadline(3i)")
params[:bulletin].delete("deadline(4i)") params[:bulletin].delete("deadline(4i)")
params[:bulletin].delete("deadline(5i)") params[:bulletin].delete("deadline(5i)")
@bulletin.deadline = nil
end rescue nil end rescue nil
end end

4
vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_quick_edit_basic.html.erb vendored
View File

@ -25,13 +25,13 @@
<div class="control-group"> <div class="control-group">
<label class="control-label"><%= t(:start) %></label> <label class="control-label"><%= t(:start) %></label>
<div class="controls"> <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> </div>
<div class="control-group"> <div class="control-group">
<label class="control-label"><%= t(:end) %></label> <label class="control-label"><%= t(:end) %></label>
<div class="controls"> <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> </div>
</div> </div>

6
vendor/built_in_modules/news/app/controllers/panel/news/back_end/news_bulletins_controller.rb vendored
View File

@ -335,12 +335,14 @@ class Panel::News::BackEnd::NewsBulletinsController < OrbitBackendController
end end
protected protected
def delete_out_invalid_date_from_params()
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)"].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(1i)")
params[:news_bulletin].delete("deadline(2i)") params[:news_bulletin].delete("deadline(2i)")
params[:news_bulletin].delete("deadline(3i)") params[:news_bulletin].delete("deadline(3i)")
@news_bulletin.deadline = nil
end rescue nil end rescue nil
end end

4
vendor/built_in_modules/news/app/views/panel/news/back_end/news_bulletins/_quick_edit_basic.html.erb vendored
View File

@ -25,13 +25,13 @@
<div class="control-group"> <div class="control-group">
<label class="control-label"><%= t(:start) %></label> <label class="control-label"><%= t(:start) %></label>
<div class="controls"> <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> </div>
<div class="control-group"> <div class="control-group">
<label class="control-label"><%= t(:end) %></label> <label class="control-label"><%= t(:end) %></label>
<div class="controls"> <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> </div>
</div> </div>