Merge remote-tracking branch 'origin/master' into beta
This commit is contained in:
commit
6dbd128e59
3
pom.xml
3
pom.xml
|
@ -38,7 +38,7 @@
|
||||||
<dependency> <!-- this dependency includes dependency to uoa-authorization-library -->
|
<dependency> <!-- this dependency includes dependency to uoa-authorization-library -->
|
||||||
<groupId>eu.dnetlib</groupId>
|
<groupId>eu.dnetlib</groupId>
|
||||||
<artifactId>uoa-admin-tools-library</artifactId>
|
<artifactId>uoa-admin-tools-library</artifactId>
|
||||||
<version>1.0.7</version>
|
<version>1.0.11</version>
|
||||||
</dependency>
|
</dependency>
|
||||||
<!--swagger-->
|
<!--swagger-->
|
||||||
<dependency>
|
<dependency>
|
||||||
|
@ -58,6 +58,7 @@
|
||||||
<plugin>
|
<plugin>
|
||||||
<groupId>org.springframework.boot</groupId>
|
<groupId>org.springframework.boot</groupId>
|
||||||
<artifactId>spring-boot-maven-plugin</artifactId>
|
<artifactId>spring-boot-maven-plugin</artifactId>
|
||||||
|
<version>${spring-boot-version}</version>
|
||||||
<configuration>
|
<configuration>
|
||||||
<mainClass>eu.dnetlib.uoaadmintools.UoaAdminToolsApplication</mainClass>
|
<mainClass>eu.dnetlib.uoaadmintools.UoaAdminToolsApplication</mainClass>
|
||||||
<executable>true</executable>
|
<executable>true</executable>
|
||||||
|
|
|
@ -102,8 +102,6 @@ public class CommunityController {
|
||||||
@PreAuthorize("hasAnyAuthority(@AuthorizationService.PORTAL_ADMIN)")
|
@PreAuthorize("hasAnyAuthority(@AuthorizationService.PORTAL_ADMIN)")
|
||||||
@RequestMapping(value = "/delete", method = RequestMethod.POST)
|
@RequestMapping(value = "/delete", method = RequestMethod.POST)
|
||||||
public Boolean deleteCommunities(@RequestBody List<String> portals) throws Exception {
|
public Boolean deleteCommunities(@RequestBody List<String> portals) throws Exception {
|
||||||
List<String> roles = rolesUtils.getRoles();
|
|
||||||
|
|
||||||
for (String id: portals) {
|
for (String id: portals) {
|
||||||
Portal portal = portalService.getPortalById(id);
|
Portal portal = portalService.getPortalById(id);
|
||||||
if(portal == null) {
|
if(portal == null) {
|
||||||
|
|
Loading…
Reference in New Issue