[airavata-django-portal] 02/02: Merge branch 'AIRAVATA-3297' into develop

[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) {