Merge branch 'ad_banner' of github.com:Rulingcom/orbit into ad_banner
This commit is contained in:
commit
d1feb102d0
|
@ -32,10 +32,10 @@
|
|||
today = today.format('isoDate');
|
||||
var state = false;
|
||||
var arr = state ? "▼" : "▲"
|
||||
var start_date = <%= "'#{@ad_image.post_date.strftime('%Y / %m / %d')}'"%> || today
|
||||
var end_date = <%= "'#{@ad_image.unpost_date.strftime('%Y / %m / %d')}'"%> || today
|
||||
var start_date = <%= @ad_image.post_date.nil?? 'today' : "'#{@ad_image.post_date.strftime('%Y / %m / %d')}'" %>;
|
||||
var end_date = <%= @ad_image.unpost_date.nil?? 'today' : "'#{@ad_image.unpost_date.strftime('%Y / %m / %d')}'" %>;
|
||||
//calendarRange
|
||||
$('#calendarRange .showDate').html(start_date+" - "+end_date)
|
||||
$('#calendarRange .showDate').html(start_date+" - "+end_date);
|
||||
$('#calendarRange .calendarInput').val(start_date+" - "+end_date);
|
||||
$('#calendarRange #widgetCalendar').DatePicker({
|
||||
flat: true,
|
||||
|
|
Reference in New Issue