Merge branch 'master' into compliance_control

1 files changed, 7 insertions, 1 deletions

diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index 47b54039c..853c2f715 100644
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -33,8 +33,14 @@ class ApplicationController < ActionController::Base
   end
   helper_method :current_organisation
 
+  def current_offer_workbench
+    current_organisation.workbenches.find_by_name("Gestion de l'offre")
+  end
+  helper_method :current_offer_workbench
+
   def current_functional_scope
-    JSON.parse(current_organisation.sso_attributes["functional_scope"]) if current_organisation
+    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