2 files changed, 11 insertions, 1 deletions
diff --git a/app/models/compliance_control.rb b/app/models/compliance_control.rb
index 73b6be8e5..763a42029 100644
--- a/app/models/compliance_control.rb
+++ b/app/models/compliance_control.rb
@@ -1,7 +1,6 @@
 class ComplianceControl < ActiveRecord::Base
   extend Enumerize
   belongs_to :compliance_control_set
-
   has_one :compliance_control_block, dependent: :destroy
   accepts_nested_attributes_for :compliance_control_block
 
@@ -15,6 +14,15 @@ class ComplianceControl < ActiveRecord::Base
   def self.policy_class
     ComplianceControlPolicy
   end
+
+  def self.inherited(child)
+    child.instance_eval do
+      def model_name
+        ComplianceControl.model_name
+      end
+    end
+    super
+  end
 end
 
 # Ensure STI subclasses are loaded
diff --git a/app/models/compliance_control_block.rb b/app/models/compliance_control_block.rb
index 7fda998eb..12b10ab2a 100644
--- a/app/models/compliance_control_block.rb
+++ b/app/models/compliance_control_block.rb
@@ -4,6 +4,8 @@ class ComplianceControlBlock < ActiveRecord::Base
 
   before_save :set_compliance_control_set
 
+  hstore_accessor :condition_attributes, transport_mode: :string
+
   def set_compliance_control_set
     self.compliance_control_set = self.compliance_control.compliance_control_set
   end