From 6846014defdc0bd95b826ec921fd7df6c42a2d34 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Valim?= Date: Thu, 5 Apr 2012 09:01:42 -0300 Subject: [PATCH] Do not make _prefixes private. --- app/controllers/devise_controller.rb | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/app/controllers/devise_controller.rb b/app/controllers/devise_controller.rb index d92295df..95de1b72 100644 --- a/app/controllers/devise_controller.rb +++ b/app/controllers/devise_controller.rb @@ -38,6 +38,17 @@ class DeviseController < Devise.parent_controller.constantize @devise_mapping ||= request.env["devise.mapping"] end + # Override prefixes to consider the scoped view. + def _prefixes #:nodoc: + @_prefixes ||= if self.class.scoped_views? && devise_mapping + super.unshift("#{devise_mapping.scoped_path}/#{controller_name}") + else + super + end + end + + hide_action :_prefixes + protected # Checks whether it's a devise mapped resource or not. @@ -67,7 +78,7 @@ MESSAGE instance_variable_set(:"@#{resource_name}", new_resource) end - # Build a devise resource. + # Build a devise resource. # Assignment bypasses attribute protection when :unsafe option is passed def build_resource(hash = nil, options = {}) hash ||= params[resource_name] || {} @@ -163,13 +174,4 @@ MESSAGE def is_navigational_format? Devise.navigational_formats.include?(request.format.try(:ref)) end - - # Override prefixes to consider the scoped view. - def _prefixes #:nodoc: - @_prefixes ||= if self.class.scoped_views? && devise_mapping - super.unshift("#{devise_mapping.scoped_path}/#{controller_name}") - else - super - end - end end