Add transport_submode attribute to ComplianceControlBlock + validation on transport mode presence

1 files changed, 10 insertions, 2 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