diff options
| author | cedricnjanga | 2017-11-22 10:20:03 +0100 |
|---|---|---|
| committer | cedricnjanga | 2017-11-22 10:20:03 +0100 |
| commit | eec1d9e43509a1677d346584ee24cd3ee6f8c124 (patch) | |
| tree | 5ea0ffc28a65f7178e5f11ae19cff353139d3159 /app/models/organisation.rb | |
| parent | 577204834de4dfcd1851fc9b5f85558eaa141a89 (diff) | |
| parent | f01e81604053e9cbdaf4b84534214e37fbfcae5e (diff) | |
| download | chouette-core-eec1d9e43509a1677d346584ee24cd3ee6f8c124.tar.bz2 | |
Merge branch 'master' into 4941-refactoring_object_id
Diffstat (limited to 'app/models/organisation.rb')
| -rw-r--r-- | app/models/organisation.rb | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/app/models/organisation.rb b/app/models/organisation.rb index 6104b4431..f6fba2d67 100644 --- a/app/models/organisation.rb +++ b/app/models/organisation.rb @@ -3,7 +3,6 @@ class Organisation < ActiveRecord::Base has_many :users, :dependent => :destroy has_many :referentials, :dependent => :destroy - # has_many :rule_parameter_sets, :dependent => :destroy has_many :compliance_control_sets, :dependent => :destroy has_many :stop_area_referential_memberships @@ -19,12 +18,6 @@ class Organisation < ActiveRecord::Base validates_presence_of :name validates_uniqueness_of :code - # after_create :add_rule_parameter_set - - # 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) raise 'Rails.application.config.stif_portail_api configuration is not defined' unless conf @@ -62,6 +55,7 @@ class Organisation < ActiveRecord::Base organisation_referential = referentials.find_by id: referential_id return organisation_referential if organisation_referential + # TODO: Replace each with find workbenches.each do |workbench| workbench_referential = workbench.all_referentials.find_by id: referential_id return workbench_referential if workbench_referential |