fix a bug where the new action would hide other actions tabs because …

…the new objects doesn't satisfy authorizations constraints
railsadminteam · Dec 4, 2012 · 4616200 · 4616200
1 parent 259ed4c
commit 4616200
Show file tree

Hide file tree

Showing 3 changed files with 264 additions and 237 deletions.
diff --git a/app/helpers/rails_admin/application_helper.rb b/app/helpers/rails_admin/application_helper.rb
@@ -5,8 +5,9 @@ module ApplicationHelper
 
     include RailsAdmin::I18nSupport
 
-    def authorized?(*args)
-      @authorization_adapter.nil? || @authorization_adapter.authorized?(*args)
+    def authorized?(action, abstract_model = nil, object = nil)
+      object = nil if object.try :new_record?
+      @authorization_adapter.nil? || @authorization_adapter.authorized?(action, abstract_model, object)
     end
 
     def current_action?(action, abstract_model = @abstract_model, object = @object)

diff --git a/lib/rails_admin/config/actions/base.rb b/lib/rails_admin/config/actions/base.rb
@@ -30,7 +30,8 @@ class Base
 
         register_instance_option :authorized? do
           (
-            bindings[:controller].nil? or bindings[:controller].authorized?(self.authorization_key, bindings[:abstract_model], bindings[:object])) and (
+            bindings[:controller].nil? or bindings[:controller].authorized?(self.authorization_key, bindings[:abstract_model], bindings[:object])
+          ) and (
             bindings[:abstract_model].nil? or (
               (only.nil? or [only].flatten.map(&:to_s).include?(bindings[:abstract_model].to_s)) and
               ![except].flatten.map(&:to_s).include?(bindings[:abstract_model].to_s) and