Fix hook errors when application has a mounted engine named Admin

TrestleAdmin · May 22, 2024 · 6e95cb6 · 6e95cb6
1 parent 64fe650
commit 6e95cb6
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/app/helpers/trestle/navigation_helper.rb b/app/helpers/trestle/navigation_helper.rb
@@ -5,7 +5,9 @@ def current_navigation_item?(item)
     end
 
     def current_admin?(admin)
-      respond_to?(:admin) && self.admin && self.admin.name == admin.name
+      respond_to?(:admin) &&
+        self.admin.respond_to?(:name) &&
+        self.admin.name == admin.name
     end
 
     def navigation_group_collapsed?(group)

diff --git a/lib/trestle/hook/helpers.rb b/lib/trestle/hook/helpers.rb
@@ -24,7 +24,7 @@ def hooks(name)
 
       def hook_sets
         @_hook_sets ||= [
-          (admin.hooks if defined?(admin) && admin),
+          (admin.hooks if defined?(admin) && admin.respond_to?(:hooks)),
           Trestle.config.hooks
         ].compact
       end