You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airavata.apache.org by ma...@apache.org on 2020/09/24 16:30:40 UTC
[airavata-django-portal] 01/02: AIRAVATA-3297 Default Admins group
to have MANAGE_SHARING permission
This is an automated email from the ASF dual-hosted git repository.
machristie pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/airavata-django-portal.git
commit ab8d2774084dd64124e19bec4f72f445c5c1f19b
Author: Marcus Christie <ma...@apache.org>
AuthorDate: Thu Sep 24 12:12:16 2020 -0400
AIRAVATA-3297 Default Admins group to have MANAGE_SHARING permission
---
.../static/common/js/components/ShareButton.vue | 18 +++++++++++++++++-
1 file changed, 17 insertions(+), 1 deletion(-)
diff --git a/django_airavata/static/common/js/components/ShareButton.vue b/django_airavata/static/common/js/components/ShareButton.vue
index 436f5a3..64e76f5 100644
--- a/django_airavata/static/common/js/components/ShareButton.vue
+++ b/django_airavata/static/common/js/components/ShareButton.vue
@@ -230,11 +230,27 @@ export default {
if (!this.localSharedEntity.entityId && this.autoAddAdminGroups) {
this.localSharedEntity.addGroup({
group: this.adminsGroup,
- permissionType: models.ResourcePermissionType.WRITE
+ permissionType: models.ResourcePermissionType.MANAGE_SHARING
});
this.localSharedEntity.addGroup({ group: this.readOnlyAdminsGroup });
this.emitUnsavedEvent();
}
+ if (this.localSharedEntity.entityId && this.autoAddAdminGroups) {
+ // AIRAVATA-3297 Admins group used to get WRITE permission, but the
+ // new default is MANAGE_SHARING so update if necessary
+ // Since autoAddAdminGroups is true, there should already be an adminsGroupPermission
+ const adminsGroupPermission = this.localSharedEntity.groupPermissions.find(
+ gp => gp.group.isGatewayAdminsGroup
+ );
+ if (
+ adminsGroupPermission.permissionType !==
+ models.ResourcePermissionType.MANAGE_SHARING
+ ) {
+ adminsGroupPermission.permissionType =
+ models.ResourcePermissionType.MANAGE_SHARING;
+ this.emitUnsavedEvent();
+ }
+ }
});
},
loadSharedEntity(entityId) {