hazza/DSpace
1
0
Fork 0
mirror of https://github.com/DSpace/DSpace.git synced 2025-10-16 22:43:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

Implement community feedbacks

Browse Source
This commit is contained in:
Mykhaylo
2020-06-11 11:20:48 +02:00
parent 41ca123ae4
commit f5b7d5854b
2 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
dspace-api/src/main/java/org/dspace/eperson/GroupServiceImpl.java
View File

@@ -659,7 +659,9 @@ public class GroupServiceImpl extends DSpaceObjectServiceImpl<Group> implements
} }
} }
} else { } else {
if (AuthorizeConfiguration.canCollectionAdminManagePolicies()) { if (AuthorizeConfiguration.canCollectionAdminManagePolicies()
|| AuthorizeConfiguration.canCommunityAdminManagePolicies()
|| AuthorizeConfiguration.canCommunityAdminManageCollectionWorkflows()) {
List<Group> groups = new ArrayList<Group>(); List<Group> groups = new ArrayList<Group>();
groups.add(group); groups.add(group);
List<ResourcePolicy> policies = resourcePolicyService.find(context, null, groups, List<ResourcePolicy> policies = resourcePolicyService.find(context, null, groups,

6
dspace-server-webapp/src/main/java/org/dspace/app/rest/security/EPersonRestAuthenticationProvider.java
View File

@@ -144,11 +144,11 @@ public class EPersonRestAuthenticationProvider implements AuthenticationProvider
if (eperson != null) { if (eperson != null) {
boolean isAdmin = false; boolean isAdmin = false;
boolean isCommunityAdmin = false; boolean isCommunityAdmin = false;
boolean isColectionAdmin = false; boolean isCollectionAdmin = false;
try { try {
isAdmin = authorizeService.isAdmin(context, eperson); isAdmin = authorizeService.isAdmin(context, eperson);
isCommunityAdmin = authorizeService.isCommunityAdmin(context, eperson); isCommunityAdmin = authorizeService.isCommunityAdmin(context, eperson);
isColectionAdmin = authorizeService.isCollectionAdmin(context, eperson); isCollectionAdmin = authorizeService.isCollectionAdmin(context, eperson);
} catch (SQLException e) { } catch (SQLException e) {
log.error("SQL error while checking for admin rights", e); log.error("SQL error while checking for admin rights", e);
} }
@@ -156,7 +156,7 @@ public class EPersonRestAuthenticationProvider implements AuthenticationProvider
if (isAdmin) { if (isAdmin) {
authorities.add(new SimpleGrantedAuthority(ADMIN_GRANT)); authorities.add(new SimpleGrantedAuthority(ADMIN_GRANT));
} else if ((isCommunityAdmin && AuthorizeUtil.canCommunityAdminManageAccounts()) } else if ((isCommunityAdmin && AuthorizeUtil.canCommunityAdminManageAccounts())
|| (isColectionAdmin && AuthorizeUtil.canCollectionAdminManageAccounts())) { || (isCollectionAdmin && AuthorizeUtil.canCollectionAdminManageAccounts())) {
authorities.add(new SimpleGrantedAuthority(ACCOUNT_ADMIN_GRANT)); authorities.add(new SimpleGrantedAuthority(ACCOUNT_ADMIN_GRANT));
} }