diff options
| author | Zog | 2018-03-29 14:38:45 +0200 |
|---|---|---|
| committer | Zog | 2018-03-29 14:38:45 +0200 |
| commit | ef01bea2bef74358e3df3e74cc613d664a9a554d (patch) | |
| tree | 19b375858b37645754198c048841458621d23737 /app/controllers | |
| parent | 1019debe93d776f0d38ae69099e6492a7dd4a87c (diff) | |
| download | chouette-core-ef01bea2bef74358e3df3e74cc613d664a9a554d.tar.bz2 | |
Refs #4658; Remove `current_functional_scope`
Diffstat (limited to 'app/controllers')
| -rw-r--r-- | app/controllers/application_controller.rb | 6 | ||||
| -rw-r--r-- | app/controllers/referentials_controller.rb | 2 |
2 files changed, 1 insertions, 7 deletions
diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb index c4961123d..9a83394e2 100644 --- a/app/controllers/application_controller.rb +++ b/app/controllers/application_controller.rb @@ -36,12 +36,6 @@ class ApplicationController < ActionController::Base end helper_method :current_organisation - def current_functional_scope - functional_scope = current_organisation.sso_attributes.try(:[], "functional_scope") if current_organisation - JSON.parse(functional_scope) if functional_scope - end - helper_method :current_functional_scope - def collection_name self.class.name.split("::").last.gsub('Controller', '').underscore end diff --git a/app/controllers/referentials_controller.rb b/app/controllers/referentials_controller.rb index 6e3694547..fe661651e 100644 --- a/app/controllers/referentials_controller.rb +++ b/app/controllers/referentials_controller.rb @@ -143,7 +143,7 @@ class ReferentialsController < ChouetteController def build_referential if params[:from] source_referential = Referential.find(params[:from]) - @referential = Referential.new_from(source_referential, current_functional_scope) + @referential = Referential.new_from(source_referential, current_organisation) end @referential.data_format = current_organisation.data_format |