Merge pull request opf#17632 from opf/bug/60609-when-opening-the-proj…

…ect-administration-menu-redirection-is-not-on-project-lifecycle Bug/60609 when opening the project administration menu redirection is not on project lifecycle
Eric-Guo · Jan 16, 2025 · b157f0d · b157f0d
2 parents db772a2 + 9a547a4
commit b157f0d
Show file tree

Hide file tree

Showing 6 changed files with 89 additions and 83 deletions.
diff --git a/app/components/work_packages/details/tab_component.rb b/app/components/work_packages/details/tab_component.rb
@@ -26,8 +26,8 @@ def menu_items
         .root
         .children
         .select do |node|
-        allowed_node?(node, User.current, project) && visible_node?(menu, node)
-      end
+          allowed_node?(node, User.current, project) && visible_node?(menu, node)
+        end
   end
 
   def full_screen_tab

diff --git a/app/controllers/admin_controller.rb b/app/controllers/admin_controller.rb
@@ -43,7 +43,7 @@ def index
       condition = node.condition
 
       name === :admin_overview ||
-        (condition && !condition.call) ||
+        (condition && !condition.call(nil)) ||
         hidden_admin_menu_items.include?(name.to_s)
     end