From f6b4a312393b3f4025ab9913e67a20f49399ea34 Mon Sep 17 00:00:00 2001 From: cedricnjanga Date: Fri, 29 Sep 2017 17:36:36 +0200 Subject: Fix Rule Parameter model to avoid error in the migrations --- app/models/organisation.rb | 8 ++++---- app/models/rule_parameter_set.rb | 22 ++++++++++++++++++++-- 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 ) -- cgit v1.2.3