aboutsummaryrefslogtreecommitdiffstats
path: root/app
diff options
context:
space:
mode:
authorXinhui2017-09-27 16:05:29 +0200
committerXinhui2017-09-27 16:05:29 +0200
commit86abe568ce4c04d14df882ece44576ff069c4a3c (patch)
tree72c695aad5de6cd7a4c685495356ca1411d52e8c /app
parent00ef063d81323cf6d80b383bda949abfeeaa520b (diff)
downloadchouette-core-86abe568ce4c04d14df882ece44576ff069c4a3c.tar.bz2
Add 'all' option to transport_modes
Refs #4518
Diffstat (limited to 'app')
-rw-r--r--app/models/compliance_control_block.rb4
-rw-r--r--app/views/compliance_controls/_form.html.slim2
2 files changed, 5 insertions, 1 deletions
diff --git a/app/models/compliance_control_block.rb b/app/models/compliance_control_block.rb
index 12b10ab2a..a08e271f6 100644
--- a/app/models/compliance_control_block.rb
+++ b/app/models/compliance_control_block.rb
@@ -9,4 +9,8 @@ class ComplianceControlBlock < ActiveRecord::Base
def set_compliance_control_set
self.compliance_control_set = self.compliance_control.compliance_control_set
end
+
+ def self.transport_modes
+ ["all"] + StifTransportModeEnumerations.transport_mode.values
+ end
end
diff --git a/app/views/compliance_controls/_form.html.slim b/app/views/compliance_controls/_form.html.slim
index c9e1c0fcc..bb8f68464 100644
--- a/app/views/compliance_controls/_form.html.slim
+++ b/app/views/compliance_controls/_form.html.slim
@@ -13,7 +13,7 @@
= f.simple_fields_for :compliance_control_block do |c|
= c.input :name
- = c.input :transport_mode, as: :select, collection:StifTransportModeEnumerations.transport_mode.options
+ = c.input :transport_mode, as: :select, collection:ComplianceControlBlock.transport_modes
end
.separator