Nemcio/SCM-Manager
1
0
Fork 0
mirror of https://github.com/scm-manager/scm-manager.git synced 2025-11-12 16:35:45 +01:00
Code Issues Packages Projects Releases Activity

fix repositoryRole systemrole check

Browse Source
This commit is contained in:
Eduard Heimbuch
2019-05-10 09:29:38 +02:00
parent 163cdf7a6b
commit a26f86d545
1 changed files with 1 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
scm-webapp/src/main/java/sonia/scm/api/v2/resources/RepositoryRoleToRepositoryRoleDtoMapper.java
View File

@@ -3,7 +3,6 @@ package sonia.scm.api.v2.resources;
import de.otto.edison.hal.Embedded;
import de.otto.edison.hal.Links;
import org.mapstruct.Mapper;
import org.mapstruct.Mapping;
import org.mapstruct.ObjectFactory;
import sonia.scm.repository.RepositoryRole;
import sonia.scm.repository.RepositoryRolePermissions;
@@ -23,13 +22,12 @@ public abstract class RepositoryRoleToRepositoryRoleDtoMapper extends BaseMapper
private ResourceLinks resourceLinks;
@Override
@Mapping(source = "type", target = "system")
public abstract RepositoryRoleDto map(RepositoryRole modelObject);
@ObjectFactory
RepositoryRoleDto createDto(RepositoryRole repositoryRole) {
Links.Builder linksBuilder = linkingTo().self(resourceLinks.repositoryRole().self(repositoryRole.getName()));
if (!isSystemRole(repositoryRole.getType()) && RepositoryRolePermissions.modify().isPermitted()) {
if (!"system".equals(repositoryRole.getType()) && RepositoryRolePermissions.modify().isPermitted()) {
linksBuilder.single(link("delete", resourceLinks.repositoryRole().delete(repositoryRole.getName())));
linksBuilder.single(link("update", resourceLinks.repositoryRole().update(repositoryRole.getName())));
}
@@ -40,7 +38,4 @@ public abstract class RepositoryRoleToRepositoryRoleDtoMapper extends BaseMapper
return new RepositoryRoleDto(linksBuilder.build(), embeddedBuilder.build());
}
boolean isSystemRole(String type) {
return "system".equals(type);
}
}