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:39 UTC
[airavata-django-portal] branch develop updated (5bc55d6 -> 34be846)
This is an automated email from the ASF dual-hosted git repository.
machristie pushed a change to branch develop
in repository https://gitbox.apache.org/repos/asf/airavata-django-portal.git.
from 5bc55d6 Merge pull request #50 from apache/AIRAVATA-3370-new-improvement-clickable-urls-in-the-application
add 3836bcd AIRAVATA-3361 Redirect handle_login to login page
add 3a0f60b AIRAVATA-3365 Increase max number of request parameters to 10000 for large wagtail pages
add ab46546 Merge pull request #46 from apache/AIRAVATA-3365-wagtail-preview-fails-error-the-number-of-get-po
add 81db726 Added notes for Windows Home users
add ad011b9 Merge pull request #47 from apache/AIRAVATA-3364-gateways-tutorial-make-it-possible-for-windows-ho
add 5cd1830 Fixing missing path in docker image build instructions
new ab8d277 AIRAVATA-3297 Default Admins group to have MANAGE_SHARING permission
new 34be846 Merge branch 'AIRAVATA-3297' into develop
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
django_airavata/settings.py | 3 +
.../static/common/js/components/ShareButton.vue | 18 ++-
docs/tutorial/gateways2019_tutorial.md | 149 ++++++++++++++++++++-
3 files changed, 167 insertions(+), 3 deletions(-)
[airavata-django-portal] 02/02: Merge branch 'AIRAVATA-3297' into
develop
Posted by ma...@apache.org.
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 34be8462c07ee0ae28977145b5f159264172c8ad
Merge: 5bc55d6 ab8d277
Author: Marcus Christie <ma...@apache.org>
AuthorDate: Thu Sep 24 12:27:49 2020 -0400
Merge branch 'AIRAVATA-3297' into develop
django_airavata/settings.py | 3 +
.../static/common/js/components/ShareButton.vue | 18 ++-
docs/tutorial/gateways2019_tutorial.md | 149 ++++++++++++++++++++-
3 files changed, 167 insertions(+), 3 deletions(-)
diff --cc django_airavata/static/common/js/components/ShareButton.vue
index c5f2e0b,64e76f5..1bee9e9
--- a/django_airavata/static/common/js/components/ShareButton.vue
+++ b/django_airavata/static/common/js/components/ShareButton.vue
@@@ -239,11 -230,27 +239,27 @@@ export default
if (!this.localSharedEntity.entityId && this.autoAddAdminGroups) {
this.localSharedEntity.addGroup({
group: this.adminsGroup,
- permissionType: models.ResourcePermissionType.WRITE,
- permissionType: models.ResourcePermissionType.MANAGE_SHARING
++ 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
++ (gp) => gp.group.isGatewayAdminsGroup
+ );
+ if (
+ adminsGroupPermission.permissionType !==
+ models.ResourcePermissionType.MANAGE_SHARING
+ ) {
+ adminsGroupPermission.permissionType =
+ models.ResourcePermissionType.MANAGE_SHARING;
+ this.emitUnsavedEvent();
+ }
+ }
});
},
loadSharedEntity(entityId) {
[airavata-django-portal] 01/02: AIRAVATA-3297 Default Admins group
to have MANAGE_SHARING permission
Posted by ma...@apache.org.
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) {