Fix dynamic_attributes in compliance_control STI Refs #2198

3 files changed, 29 insertions, 7 deletions

diff --git a/app/controllers/compliance_control_sets_controller.rb b/app/controllers/compliance_control_sets_controller.rb
index 0e4520d1f..5371c65f5 100644
--- a/app/controllers/compliance_control_sets_controller.rb
+++ b/app/controllers/compliance_control_sets_controller.rb
@@ -26,9 +26,9 @@ class ComplianceControlSetsController < BreadcrumbController
 
   protected
 
-  # def begin_of_association_chain
-  #   current_organisation
-  # end
+  def begin_of_association_chain
+    current_organisation
+  end
 
   private
 
diff --git a/app/models/compliance_control.rb b/app/models/compliance_control.rb
index 0860f07b6..e859aaba0 100644
--- a/app/models/compliance_control.rb
+++ b/app/models/compliance_control.rb
@@ -4,6 +4,7 @@ class ComplianceControl < ActiveRecord::Base
   belongs_to :compliance_control_block
 
   enumerize :criticity, in: %i(info warning error), scope: true, default: :info
+  hstore_accessor :control_attributes, {}
 
   validates :criticity, presence: true
   validates :name, presence: true
@@ -14,6 +15,9 @@ class ComplianceControl < ActiveRecord::Base
   class << self
     def default_criticity; :warning end
     def default_code; "" end
+    def dynamic_attributes
+      hstore_metadata_for_control_attributes.keys
+    end
 
     def policy_class
       ComplianceControlPolicy
@@ -40,3 +44,25 @@ end
 # Ensure STI subclasses are loaded
 # http://guides.rubyonrails.org/autoloading_and_reloading_constants.html#autoloading-and-sti
 require_dependency 'generic_attribute_control/min_max'
+require_dependency 'generic_attribute_control/pattern'
+require_dependency 'generic_attribute_control/uniqueness'
+require_dependency 'journey_pattern_control/duplicates'
+require_dependency 'journey_pattern_control/vehicle_journey'
+require_dependency 'line_control/route'
+require_dependency 'route_control/duplicates'
+require_dependency 'route_control/journey_pattern'
+require_dependency 'route_control/minimum_length'
+require_dependency 'route_control/omnibus_journey_pattern'
+require_dependency 'route_control/opposite_route_terminus'
+require_dependency 'route_control/opposite_route'
+require_dependency 'route_control/speed'
+require_dependency 'route_control/stop_points_in_journey_pattern'
+require_dependency 'route_control/time_table'
+require_dependency 'route_control/unactivated_stop_points'
+require_dependency 'route_control/vehicle_journey_at_stops'
+require_dependency 'route_control/zdl_stop_area'
+require_dependency 'routing_constraint_zone_control/maximum_length'
+require_dependency 'routing_constraint_zone_control/minimum_length'
+require_dependency 'routing_constraint_zone_control/unactivated_stop_point'
+require_dependency 'vehicle_journey_control/delta'
+require_dependency 'vehicle_journey_control/waiting_time'
diff --git a/app/models/generic_attribute_control/min_max.rb b/app/models/generic_attribute_control/min_max.rb
index 0b0e5a9a7..452d1d889 100644
--- a/app/models/generic_attribute_control/min_max.rb
+++ b/app/models/generic_attribute_control/min_max.rb
@@ -2,7 +2,6 @@ module GenericAttributeControl
   class MinMax < ComplianceControl
     hstore_accessor :control_attributes, minimum: :integer, maximum: :integer
 
-
     validate :min_max_values
     def min_max_values
       true
@@ -11,9 +10,6 @@ module GenericAttributeControl
     class << self
       def default_criticity; :warning end
       def default_code; "3-Generic-2" end
-      def dynamic_attributes
-        hstore_metadata_for_control_attributes.keys
-      end
     end
   end
 end