diff options
| author | Luc Donnet | 2018-03-27 10:50:42 +0200 |
|---|---|---|
| committer | GitHub | 2018-03-27 10:50:42 +0200 |
| commit | 25cbe2bfac1de0c6268f8d19f39a8496a88977cd (patch) | |
| tree | 33153132459274645bcc63ade4571aabfd2ca5af | |
| parent | 1386e3c2d525b61bf0e6a7ace9ed755bff9eb998 (diff) | |
| parent | fb3798e12e72057ca6174d7470698be6e10b1ba8 (diff) | |
| download | chouette-core-25cbe2bfac1de0c6268f8d19f39a8496a88977cd.tar.bz2 | |
Merge pull request #384 from af83/6190-fix-consistency-issue-with-calendars
6190 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 1025130fd..a87a3dab5 100644 --- a/app/views/calendars/_form_simple.html.slim +++ b/app/views/calendars/_form_simple.html.slim @@ -32,24 +32,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 9e118e972..d90bf7b6c 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -842,6 +842,7 @@ ActiveRecord::Schema.define(version: 20180319043333) do t.integer "waiting_time" t.string "kind" t.jsonb "localized_names" + t.datetime "confirmed_at" t.json "custom_field_values" |