Skip to content
Snippets Groups Projects

fix(org unit creation): do not set current person as manager when org unit creator is user

1 file
+ 3
2
Compare changes
  • Side-by-side
  • Inline
@@ -53,6 +53,7 @@ import org.springframework.web.multipart.MultipartFile;
import org.springframework.web.servlet.mvc.method.annotation.StreamingResponseBody;
import ch.unige.solidify.SolidifyConstants;
import ch.unige.solidify.auth.service.ApplicationRoleListService;
import ch.unige.solidify.controller.ResourceWithLogoController;
import ch.unige.solidify.rest.ActionName;
import ch.unige.solidify.rest.RestCollection;
@@ -76,7 +77,7 @@ import ch.dlcm.service.rest.propagate.PropagatePersonRemoteResourceService;
@RestController
@ConditionalOnBean(AdminController.class)
@RequestMapping(UrlPath.ADMIN_ORG_UNIT)
public class OrganizationalUnitController extends ResourceWithLogoController<OrganizationalUnit> {
public class OrganizationalUnitController extends ResourceWithLogoController<OrganizationalUnit> implements ApplicationRoleListService {
private static final Logger log = LoggerFactory.getLogger(OrganizationalUnitController.class);
@@ -103,7 +104,7 @@ public class OrganizationalUnitController extends ResourceWithLogoController<Org
/**
* Set the authenticated user as a manager on the new organizational unit
*/
if (httpResponse.getStatusCode() == HttpStatus.CREATED && organizationalUnit != null) {
if (httpResponse.getStatusCode() == HttpStatus.CREATED && organizationalUnit != null && this.isRootOrTrustedOrAdminRole()) {
final Authentication authentication = SecurityContextHolder.getContext().getAuthentication();
Loading