aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorcedricnjanga2017-09-29 17:36:36 +0200
committercedricnjanga2017-09-29 17:36:36 +0200
commitf6b4a312393b3f4025ab9913e67a20f49399ea34 (patch)
treed1ccd3dbcebe34bdfd3e82d51663ca2a92591e79
parent5f8fec15211d8ee8641a090c752eb6480979b74e (diff)
downloadchouette-core-f6b4a312393b3f4025ab9913e67a20f49399ea34.tar.bz2
Fix Rule Parameter model to avoid error in the migrations
-rw-r--r--app/models/organisation.rb8
-rw-r--r--app/models/rule_parameter_set.rb22
2 files changed, 24 insertions, 6 deletions
diff --git a/app/models/organisation.rb b/app/models/organisation.rb
index ffbbdd542..6104b4431 100644
--- a/app/models/organisation.rb
+++ b/app/models/organisation.rb
@@ -3,7 +3,7 @@ class Organisation < ActiveRecord::Base
has_many :users, :dependent => :destroy
has_many :referentials, :dependent => :destroy
- has_many :rule_parameter_sets, :dependent => :destroy
+ # has_many :rule_parameter_sets, :dependent => :destroy
has_many :compliance_control_sets, :dependent => :destroy
has_many :stop_area_referential_memberships
@@ -21,9 +21,9 @@ class Organisation < ActiveRecord::Base
# after_create :add_rule_parameter_set
- def add_rule_parameter_set
- RuleParameterSet.default_for_all_modes( self).save
- end
+ # def add_rule_parameter_set
+ # RuleParameterSet.default_for_all_modes( self).save
+ # end
def self.portail_api_request
conf = Rails.application.config.try(:stif_portail_api)
diff --git a/app/models/rule_parameter_set.rb b/app/models/rule_parameter_set.rb
index 122483711..91e575822 100644
--- a/app/models/rule_parameter_set.rb
+++ b/app/models/rule_parameter_set.rb
@@ -65,8 +65,26 @@ class RuleParameterSet < ActiveRecord::Base
end
def self.all_modes
- # Chouette::TransportMode.all.map { |m| m.to_s}
- []
+ ["interchange",
+ "unknown",
+ "coach",
+ "air",
+ "waterborne",
+ "bus",
+ "ferry",
+ "walk",
+ "metro",
+ "shuttle",
+ "rapid_transit",
+ "taxi",
+ "local_train",
+ "train",
+ "long_distance_train",
+ "tramway",
+ "trolleybus",
+ "private_vehicle",
+ "bicycle",
+ "other"]
end
def self.mode_attribute?( method_name )