mirror of
https://github.com/scm-manager/scm-manager.git
synced 2026-01-04 22:59:51 +01:00
Simplify permissions
This commit is contained in:
@@ -47,7 +47,7 @@ class NamespaceToNamespaceDtoMapper {
|
||||
.self(links.namespace().self(namespace))
|
||||
.single(link("repositories", links.repositoryCollection().forNamespace(namespace)));
|
||||
|
||||
if (NamespacePermissions.permissionRead().isPermitted() || NamespacePermissions.permissionWrite().isPermitted()) {
|
||||
if (NamespacePermissions.permissionRead().isPermitted()) {
|
||||
linkingTo
|
||||
.single(link("permissions", links.namespacePermission().all(namespace)));
|
||||
}
|
||||
|
||||
@@ -78,9 +78,7 @@ public class RepositoryPermissionCollectionToDtoMapper {
|
||||
}
|
||||
|
||||
private Links createLinks(Namespace namespace) {
|
||||
if (!NamespacePermissions.permissionWrite().isPermitted()) {
|
||||
NamespacePermissions.permissionRead().check();
|
||||
}
|
||||
NamespacePermissions.permissionRead().check();
|
||||
Links.Builder linksBuilder = linkingTo()
|
||||
.with(Links.linkingTo().self(resourceLinks.namespacePermission().all(namespace.getNamespace())).build());
|
||||
if (NamespacePermissions.permissionWrite().isPermitted()) {
|
||||
|
||||
@@ -104,7 +104,7 @@ public class DefaultNamespaceManager implements NamespaceManager {
|
||||
}
|
||||
|
||||
private Namespace createNamespaceForName(String namespace) {
|
||||
if (NamespacePermissions.permissionRead().isPermitted() || NamespacePermissions.permissionWrite().isPermitted()) {
|
||||
if (NamespacePermissions.permissionRead().isPermitted()) {
|
||||
return dao.get(namespace)
|
||||
.map(Namespace::clone)
|
||||
.orElse(new Namespace(namespace));
|
||||
|
||||
@@ -48,7 +48,7 @@
|
||||
<value>namespace:permissionRead</value>
|
||||
</permission>
|
||||
<permission>
|
||||
<value>namespace:permissionWrite</value>
|
||||
<value>namespace:permissionRead,permissionWrite</value>
|
||||
</permission>
|
||||
<permission>
|
||||
<value>user:*</value>
|
||||
|
||||
@@ -98,7 +98,7 @@
|
||||
"displayName": "Berechtigungen auf Namespaces lesen",
|
||||
"description": "Darf die Berechtigungen auf Namespace-Ebene sehen"
|
||||
},
|
||||
"permissionWrite": {
|
||||
"permissionRead,permissionWrite": {
|
||||
"displayName": "Berechtigungen auf Namespaces modifizieren",
|
||||
"description": "Darf die Berechtigungen auf Namespace-Ebene lesen und bearbeiten"
|
||||
}
|
||||
|
||||
@@ -98,7 +98,7 @@
|
||||
"displayName": "Read permissions on namespaces",
|
||||
"description": "May see the permissions set for namespaces"
|
||||
},
|
||||
"permissionWrite": {
|
||||
"permissionRead,permissionWrite": {
|
||||
"displayName": "Modify permissions on namespaces",
|
||||
"description": "May read and modify the permissions set for namespaces"
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user