aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--app/controllers/compliance_control_blocks_controller.rb2
-rw-r--r--app/models/compliance_control_block.rb8
-rw-r--r--app/views/compliance_control_blocks/_form.html.slim2
3 files changed, 6 insertions, 6 deletions
diff --git a/app/controllers/compliance_control_blocks_controller.rb b/app/controllers/compliance_control_blocks_controller.rb
index 9d231e25e..2dd69a865 100644
--- a/app/controllers/compliance_control_blocks_controller.rb
+++ b/app/controllers/compliance_control_blocks_controller.rb
@@ -6,7 +6,7 @@ class ComplianceControlBlocksController < BreadcrumbController
private
def compliance_control_block_params
- params.require(:compliance_control_block).permit(:transport_mode, :transport_sub_mode)
+ params.require(:compliance_control_block).permit(:transport_mode, :transport_submode)
end
end \ No newline at end of file
diff --git a/app/models/compliance_control_block.rb b/app/models/compliance_control_block.rb
index 7213e0812..05952e9e2 100644
--- a/app/models/compliance_control_block.rb
+++ b/app/models/compliance_control_block.rb
@@ -4,15 +4,15 @@ class ComplianceControlBlock < ActiveRecord::Base
hstore_accessor :condition_attributes,
transport_mode: :string,
- transport_sub_mode: :string
+ transport_submode: :string
validates_presence_of :transport_mode
def self.transport_modes
- StifTransportModeEnumerations.transport_mode.options
+ StifTransportModeEnumerations.transport_modes
end
- def self.transport_sub_modes
- StifTransportSubmodeEnumerations.transport_submode.options
+ def self.transport_submodes
+ StifTransportSubmodeEnumerations.transport_submodes
end
end
diff --git a/app/views/compliance_control_blocks/_form.html.slim b/app/views/compliance_control_blocks/_form.html.slim
index 23271ea9b..88fa7e98b 100644
--- a/app/views/compliance_control_blocks/_form.html.slim
+++ b/app/views/compliance_control_blocks/_form.html.slim
@@ -3,7 +3,7 @@
.col-lg-12
.form-group
= f.input :transport_mode, as: :select, collection: ComplianceControlBlock.transport_modes, label: t('activerecord.attributes.compliance_control_blocks.transport_mode')
- = f.input :transport_sub_mode, as: :select, collection: ComplianceControlBlock.transport_sub_modes, label: t('activerecord.attributes.compliance_control_blocks.transport_submode')
+ = f.input :transport_submode, as: :select, collection: ComplianceControlBlock.transport_submodes, label: t('activerecord.attributes.compliance_control_blocks.transport_submode')
.separator