Refs: #4823@4h; Fixed Transport(Sub)mode validation bug

5 files changed, 37 insertions, 34 deletions

diff --git a/app/models/compliance_check_block.rb b/app/models/compliance_check_block.rb
index eb4654756..05240b428 100644
--- a/app/models/compliance_check_block.rb
+++ b/app/models/compliance_check_block.rb
@@ -1,6 +1,6 @@
 class ComplianceCheckBlock < ActiveRecord::Base
-  extend StifTransportModeEnumerations
-  extend StifTransportSubmodeEnumerations
+  include StifTransportModeEnumerations
+  include StifTransportSubmodeEnumerations
 
   belongs_to :compliance_check_set
 
diff --git a/app/models/compliance_control_block.rb b/app/models/compliance_control_block.rb
index 5721c00f4..cfcdfd1a6 100644
--- a/app/models/compliance_control_block.rb
+++ b/app/models/compliance_control_block.rb
@@ -1,6 +1,6 @@
 class ComplianceControlBlock < ActiveRecord::Base
-  extend StifTransportModeEnumerations
-  extend StifTransportSubmodeEnumerations
+  include StifTransportModeEnumerations
+  include StifTransportSubmodeEnumerations
 
   belongs_to :compliance_control_set
   has_many :compliance_controls, dependent: :destroy
diff --git a/app/models/concerns/stif_transport_mode_enumerations.rb b/app/models/concerns/stif_transport_mode_enumerations.rb
index c2d38c2c6..74621dfc5 100644
--- a/app/models/concerns/stif_transport_mode_enumerations.rb
+++ b/app/models/concerns/stif_transport_mode_enumerations.rb
@@ -1,19 +1,18 @@
 module StifTransportModeEnumerations
   extend ActiveSupport::Concern
-  extend Enumerize
-  extend self
 
-  enumerize :transport_mode, in: %w(bus
-                                    metro
-                                    rail
-                                    tram
-                                    funicular)
-
-  def transport_modes
-    StifTransportModeEnumerations.transport_mode.values
+  class << self
+    def transport_modes
+      %w(bus metro rail tram funicular)
+    end
+    def sorted_transport_modes
+      transport_modes.sort_by{|m| I18n.t("enumerize.transport_mode.#{m}").parameterize }
+    end
   end
-
-  def sorted_transport_modes
-    self.transport_modes.sort_by{|m| I18n.t("enumerize.transport_mode.#{m}").parameterize }
+  
+  included do
+    extend Enumerize
+    enumerize :transport_mode, in: StifTransportModeEnumerations.transport_modes
   end
+
 end
diff --git a/app/models/concerns/stif_transport_submode_enumerations.rb b/app/models/concerns/stif_transport_submode_enumerations.rb
index cf314badd..eb3e56eac 100644
--- a/app/models/concerns/stif_transport_submode_enumerations.rb
+++ b/app/models/concerns/stif_transport_submode_enumerations.rb
@@ -1,24 +1,28 @@
 module StifTransportSubmodeEnumerations
   extend ActiveSupport::Concern
-  extend Enumerize
-  extend self
 
-  enumerize :transport_submode, in: %w(demandAndResponseBus
-                                       nightBus
-                                       airportLinkBus
-                                       highFrequencyBus
-                                       expressBus
-                                       railShuttle
-                                       suburbanRailway
-                                       regionalRail
-                                       interregionalRail
-)
+  class << self
+    def transport_submodes
+      %w(
+      demandAndResponseBus
+      nightBus
+      airportLinkBus
+      highFrequencyBus
+      expressBus
+      railShuttle
+      suburbanRailway
+      regionalRail
+      interregionalRail)
+    end
 
-  def transport_submodes
-    StifTransportSubmodeEnumerations.transport_submode.values
+    def sorted_transport_submodes
+      transport_submodes.sort_by{|m| I18n.t("enumerize.transport_submode.#{m}").parameterize }
+    end
   end
 
-  def sorted_transport_submodes
-    self.transport_submodes.sort_by{|m| I18n.t("enumerize.transport_submode.#{m}").parameterize }
+  included do
+    extend Enumerize
+    enumerize :transport_submode, in: StifTransportSubmodeEnumerations.transport_submodes
   end
+  
 end
diff --git a/app/models/line_referential.rb b/app/models/line_referential.rb
index 8bc6adec3..7ab892b53 100644
--- a/app/models/line_referential.rb
+++ b/app/models/line_referential.rb
@@ -1,5 +1,5 @@
 class LineReferential < ActiveRecord::Base
-  extend StifTransportModeEnumerations
+  include StifTransportModeEnumerations
   
   has_many :line_referential_memberships
   has_many :organisations, through: :line_referential_memberships