Skip to content

Commit 401c412

Browse files
Merge branch 'main' into 4503-super-admin-create-users
2 parents f1bcaad + d1c52ea commit 401c412

59 files changed

Lines changed: 28 additions & 83 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

Gemfile.lock

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -831,4 +831,4 @@ DEPENDENCIES
831831
webmock (~> 3.24)
832832

833833
BUNDLED WITH
834-
2.6.5
834+
2.6.6

app/views/layouts/_lte_navbar.html.erb

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -50,10 +50,12 @@
5050
<i class="fa fa-repeat text-aqua"></i><%= "Switch to: #{role.resource&.name || "Super Admin"}" %>
5151
<% end %>
5252
<% end %>
53-
<% if current_user.has_cached_role?(Role::ORG_ADMIN, current_organization) %>
53+
<% if current_user.has_cached_role?(Role::ORG_ADMIN, current_organization) %>
5454
<div class="dropdown-divider"></div>
55-
<%= link_to users_path, class:"dropdown-item" do %>
56-
<i class="fas fa-users mr-2"></i> My Co-Workers
55+
<% if current_user.has_cached_role?(:partner) %>
56+
<%= link_to users_path, class:"dropdown-item" do %>
57+
<i class="fas fa-users mr-2"></i> My Co-Workers
58+
<% end %>
5759
<% end %>
5860
<%= link_to organization_path, class:"dropdown-item" do %>
5961
<i class="fas fa-sitemap mr-2"></i> My Organization

docs/user_guide/bank/account_management.md

Lines changed: 0 additions & 1 deletion

docs/user_guide/bank/asking_for_changes.md

Lines changed: 0 additions & 1 deletion

docs/user_guide/bank/community_donation_sites.md

Lines changed: 0 additions & 1 deletion

docs/user_guide/bank/community_manufacturers.md

Lines changed: 0 additions & 1 deletion

docs/user_guide/bank/community_product_drive_participants.md

Lines changed: 0 additions & 1 deletion

docs/user_guide/bank/community_product_drives.md

Lines changed: 0 additions & 1 deletion

docs/user_guide/bank/community_vendors.md

Lines changed: 0 additions & 1 deletion

docs/user_guide/bank/essentials_dashboard.md

Lines changed: 0 additions & 1 deletion

0 commit comments

Comments
 (0)