diff options
| author | Zog | 2018-03-15 16:44:16 +0100 |
|---|---|---|
| committer | Zog | 2018-03-15 16:52:54 +0100 |
| commit | fb3798e12e72057ca6174d7470698be6e10b1ba8 (patch) | |
| tree | 6a6d902d218686f7859ed3fafdb99700d27e506f | |
| parent | 499a46cabdf2ee1aab830f27c3aa3e896ded24e3 (diff) | |
| download | chouette-core-6190-fix-consistency-issue-with-calendars.tar.bz2 | |
Refs #6190; Make Calendar creation more consistent6190-fix-consistency-issue-with-calendars
| -rw-r--r-- | app/views/calendars/_form_simple.html.slim | 38 | ||||
| -rw-r--r-- | db/schema.rb | 1 |
2 files changed, 20 insertions, 19 deletions
diff --git a/app/views/calendars/_form_simple.html.slim b/app/views/calendars/_form_simple.html.slim index ba18c765b..a0b10271c 100644 --- a/app/views/calendars/_form_simple.html.slim +++ b/app/views/calendars/_form_simple.html.slim @@ -33,24 +33,24 @@ .separator - .row - .col-lg-12 - .subform - .nested-head - .wrapper - div - .form-group - label.control-label - = t('simple_form.labels.calendar.ranges.begin') - div - .form-group - label.control-label - = t('simple_form.labels.calendar.ranges.end') - div - - = f.simple_fields_for :periods do |period| - = render 'period_fields', f: period - .links.nested-linker - = link_to_add_association t('simple_form.labels.calendar.add_a_date_range'), f, :periods, class: 'btn btn-outline-primary' + .row + .col-lg-12 + .subform + .nested-head + .wrapper + div + .form-group + label.control-label + = t('simple_form.labels.calendar.ranges.begin') + div + .form-group + label.control-label + = t('simple_form.labels.calendar.ranges.end') + div + + = f.simple_fields_for :periods do |period| + = render 'period_fields', f: period + .links.nested-linker + = link_to_add_association t('simple_form.labels.calendar.add_a_date_range'), f, :periods, class: 'btn btn-outline-primary' = f.button :submit, t('actions.submit'), class: 'btn btn-default formSubmitr', form: 'calendar_form' diff --git a/db/schema.rb b/db/schema.rb index 2f9ffa840..48aab7dcf 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -800,6 +800,7 @@ ActiveRecord::Schema.define(version: 20180308095116) do t.integer "waiting_time" t.string "kind" t.jsonb "localized_names" + t.datetime "confirmed_at" end |