blackroad-os/backroad
9
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix(app/registries): sidebar menus and registry accesses users filtering

Browse Source
This commit is contained in:
LP B
2021-05-26 16:58:28 +02:00
parent 7c8c251021
commit 464c44bb17
2 changed files with 2 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/kubernetes/components/kubernetes-sidebar-content/kubernetesSidebarContent.html
View File

@@ -18,7 +18,7 @@
<div
ng-if="
$ctrl.adminAccess &&
['kubernetes.cluster', 'portainer.endpoints.endpoint.kubernetesConfig', 'kubernetes.registries', 'kubernetes.registries.access'].includes($ctrl.currentRouteName)
['kubernetes.cluster', 'portainer.endpoints.endpoint.kubernetesConfig', 'kubernetes.registries', 'kubernetes.registries.access'].includes($ctrl.currentState)
"
>
<div class="sidebar-sublist">

4
app/portainer/components/accessManagement/porAccessManagementController.js
View File

@@ -65,9 +65,7 @@ class PorAccessManagementController {
if (!userRole && !teamRole) {
return false;
}
const roleId = (userRole && userRole.RoleId) || (teamRole && teamRole.RoleId);
const role = _.find(this.roles, { Id: roleId });
return role && (role.Authorizations['DockerImageCreate'] || role.Authorizations['DockerImagePush']) && !role.Authorizations['EndpointResourcesAccess'];
return userRole || teamRole;
});
}
this.availableUsersAndTeams = _.orderBy(data.availableUsersAndTeams, 'Name', 'asc');