gunghogeoduck/osem-fcy
1
0
Fork 0
mirror of https://github.com/openSUSE/osem.git synced 2026-08-18 22:21:11 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Default date removed from conference registrations.

Browse source
This commit is contained in:
gotens1211 2017-02-20 01:52:50 +05:30
parent cf29150a2a
commit 82db583217
2 changed files with 2 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
app/assets/javascripts/osem-datepickers.js
View file

@ -18,7 +18,6 @@ $(function () {
// current_date <= arrival_date <= end_date
maxDate : $("#registration-arrival-datepicker").attr('end_date'),
minDate : today,
defaultDate : $("#registration-arrival-datepicker").attr('start_date'),
});
$("#registration-departure-datepicker").datetimepicker({
@ -29,7 +28,6 @@ $(function () {
format: "YYYY-MM-DD HH:mm",
// departure_date > start_date
minDate : $("#registration-arrival-datepicker").attr('start_date'),
defaultDate : $("#registration-arrival-datepicker").attr('end_date'),
});
$("#registration-arrival-datepicker").on("dp.change",function (e) {

4
app/views/conference_registrations/_registration_info.html.haml
View file

@ -17,5 +17,5 @@
= f.inputs 'Your Travel Info' do
= f.input :arrival, as: :string, label: 'Your arrival time', input_html: { value: (f.object.arrival.to_formatted_s(:db_without_seconds) unless f.object.arrival.nil?), id: 'registration-arrival-datepicker',start_date: @conference.start_date,end_date: @conference.end_date,readonly: 'readonly' }
= f.input :departure, as: :string, label: 'Your departure time', input_html: { value: (f.object.departure.to_formatted_s(:db_without_seconds) unless f.object.departure.nil?), id: 'registration-departure-datepicker', readonly: 'readonly' }
= f.input :arrival, as: :string, label: 'Your arrival time', hint: "Leave blank if not sure", input_html: { value: (f.object.arrival.to_formatted_s(:db_without_seconds) unless f.object.arrival.nil?), id: 'registration-arrival-datepicker',start_date: @conference.start_date,end_date: @conference.end_date}
= f.input :departure, as: :string, label: 'Your departure time', hint: "Leave blank if not sure", input_html: { value: (f.object.departure.to_formatted_s(:db_without_seconds) unless f.object.departure.nil?), id: 'registration-departure-datepicker'}