diff options
| author | cedricnjanga | 2017-09-29 15:32:12 +0200 |
|---|---|---|
| committer | cedricnjanga | 2017-09-29 16:44:31 +0200 |
| commit | 4764d2cdc34e44a0040115b99e8984aea5a6b569 (patch) | |
| tree | ec4e265ec649d752babf880843b6d16e42cb2443 | |
| parent | 95d63430c5deba078749396bcb919c49b71d1bd7 (diff) | |
| download | chouette-core-4764d2cdc34e44a0040115b99e8984aea5a6b569.tar.bz2 | |
Add transport_submode attribute to ComplianceControlBlock + validation on transport mode presence
| -rw-r--r-- | app/models/compliance_control_block.rb | 12 | ||||
| -rw-r--r-- | app/views/compliance_control_blocks/_form.html.slim | 5 | ||||
| -rw-r--r-- | app/views/compliance_control_blocks/edit.html.slim | 2 |
3 files changed, 14 insertions, 5 deletions
diff --git a/app/models/compliance_control_block.rb b/app/models/compliance_control_block.rb index e03c4ce85..7213e0812 100644 --- a/app/models/compliance_control_block.rb +++ b/app/models/compliance_control_block.rb @@ -2,9 +2,17 @@ class ComplianceControlBlock < ActiveRecord::Base belongs_to :compliance_control_set has_many :compliance_controls, dependent: :destroy - hstore_accessor :condition_attributes, transport_mode: :string + hstore_accessor :condition_attributes, + transport_mode: :string, + transport_sub_mode: :string + + validates_presence_of :transport_mode def self.transport_modes - ["all"] + StifTransportModeEnumerations.transport_mode.values + StifTransportModeEnumerations.transport_mode.options + end + + def self.transport_sub_modes + StifTransportSubmodeEnumerations.transport_submode.options end end diff --git a/app/views/compliance_control_blocks/_form.html.slim b/app/views/compliance_control_blocks/_form.html.slim index b20b5d0cc..877af91cb 100644 --- a/app/views/compliance_control_blocks/_form.html.slim +++ b/app/views/compliance_control_blocks/_form.html.slim @@ -1,8 +1,9 @@ = simple_form_for [@compliance_control_set, @compliance_control_block], html: { class: 'form-horizontal', id: 'compliance_control_block_form' }, wrapper: :horizontal_form do |f| .row .col-lg-12 - = f.input :transport_mode, as: :select, collection: ComplianceControlBlock.transport_modes - / = f.input :sub_transport_mode + .form-group + = f.input :transport_mode, as: :select, collection: ComplianceControlBlock.transport_modes, label: t('activerecord.attributes.compliance_control_block.transport_mode') + = f.input :transport_sub_mode, as: :select, collection: ComplianceControlBlock.transport_sub_modes, label: t('activerecord.attributes.compliance_control_block.transport_sub_mode') .separator diff --git a/app/views/compliance_control_blocks/edit.html.slim b/app/views/compliance_control_blocks/edit.html.slim index fbd42e7f3..0ac507ece 100644 --- a/app/views/compliance_control_blocks/edit.html.slim +++ b/app/views/compliance_control_blocks/edit.html.slim @@ -1,6 +1,6 @@ / PageHeader = pageheader 'modele-calendrier', - t('compliance_control_blocks.edit.title') + t('compliance_control_blocks.edit.title', compliance_control_block: @compliance_control_block.id) / PageContent |