From 747d333ffbcc8ee0c9f1daf93ccca32799434e04 Mon Sep 17 00:00:00 2001 From: Robert Date: Mon, 3 Jul 2017 08:27:45 +0200 Subject: Refs: #3478@2h Access correct referential in line_footnotes Ctrl + ApplicationController provides Pundit's UserContext's referential with `@referential` instead of `current_referential`, (`@referential` is computed from the URL, while `current_referential` was aliased to different methods, **not always** pointing to `Referential` instances) + ApplicationPolicy uses the record's referential in its `referential method` iff it is an instance of `Referential` else it uses the abovely provided referential, locally named `@current_referential` (as it should be named in the Ctrl too) This assures, in combination with the Ctrl Change, that `referential` **always** returns an instance of `Referential`! - TODO: Review my understanding of _Referential Setup_ inside the Ctrls --- app/controllers/application_controller.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'app/controllers/application_controller.rb') diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb index 42b7c2a25..8fcaa3b1b 100644 --- a/app/controllers/application_controller.rb +++ b/app/controllers/application_controller.rb @@ -19,7 +19,7 @@ class ApplicationController < ActionController::Base end def pundit_user - UserContext.new(current_user, referential: self.try(:current_referential)) + UserContext.new(current_user, referential: @referential) end protected -- cgit v1.2.3