Remove 'My Organization' link for superadmins that are also org admins

jp524 · May 22, 2024 · ef20ccd · ef20ccd
1 parent 6ba8161
commit ef20ccd
Show file tree

Hide file tree

Showing 4 changed files with 2 additions and 42 deletions.
diff --git a/app/views/layouts/_lte_admin_sidebar.html.erb b/app/views/layouts/_lte_admin_sidebar.html.erb
@@ -139,13 +139,4 @@
     </li>
   <% end %>
 
-  <% if (current_user.organization.present?) %>
-    <li class="nav-item">
-      <%= link_to(dashboard_path, class: "nav-link") do %>
-        <i class="nav-icon fas fa-home"></i>
-        <p>My Organization</p>
-      <% end %>
-    </li>
-  <% end %>
-
 </ul>
diff --git a/app/views/layouts/_lte_navbar.html.erb b/app/views/layouts/_lte_navbar.html.erb
@@ -50,8 +50,7 @@
         <i class="fa fa-repeat text-aqua"></i><%= "Switch to: #{role.resource&.name || "Super Admin"}" %>
       <% end %>
     <% end %>
-    <% if current_organization.id.present? &&
-        (current_user.has_role?(Role::SUPER_ADMIN) || current_user.has_role?(Role::ORG_ADMIN, current_organization)) %>
+    <% if current_user.has_role?(Role::ORG_ADMIN, current_organization) %>
         <div class="dropdown-divider"></div>
         <%= link_to users_path, class:"dropdown-item" do %>
           <i class="fas fa-users mr-2"></i> My Co-Workers

diff --git a/spec/system/admin/dashboard_system_spec.rb b/spec/system/admin/dashboard_system_spec.rb
diff --git a/spec/system/navigation_system_spec.rb b/spec/system/navigation_system_spec.rb
@@ -63,7 +63,7 @@
 
     context "with superadmin user" do
       let(:user) { create(:super_admin) }
-      let(:links) { ["Admin Dashboard", "Barcode Items", "Base Items", "Organizations", "Partners", "Users", "Announcements", "Account Requests", "FAQ", "My Organization"] }
+      let(:links) { ["Admin Dashboard", "Barcode Items", "Base Items", "Organizations", "Partners", "Users", "Announcements", "Account Requests", "FAQ"] }
 
       it "shows navigation options" do
         sidebar = page.find(".sidebar")