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 2019/05/31 18:18:19 UTC
[airavata-django-portal] 04/05: AIRAVATA-3040 Don't allow editing
owner of group
This is an automated email from the ASF dual-hosted git repository.
machristie pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/airavata-django-portal.git
commit 61f918ba30f8f6422b471596e33c0bc007022391
Author: Marcus Christie <ma...@apache.org>
AuthorDate: Thu May 30 12:59:16 2019 -0400
AIRAVATA-3040 Don't allow editing owner of group
---
.../src/components/users/UserDetailsContainer.vue | 1 +
.../src/components/users/UserGroupMembershipEditor.vue | 8 +++++++-
2 files changed, 8 insertions(+), 1 deletion(-)
diff --git a/django_airavata/apps/admin/static/django_airavata_admin/src/components/users/UserDetailsContainer.vue b/django_airavata/apps/admin/static/django_airavata_admin/src/components/users/UserDetailsContainer.vue
index f47101b..33f96c5 100644
--- a/django_airavata/apps/admin/static/django_airavata_admin/src/components/users/UserDetailsContainer.vue
+++ b/django_airavata/apps/admin/static/django_airavata_admin/src/components/users/UserDetailsContainer.vue
@@ -2,6 +2,7 @@
<user-group-membership-editor
v-model="localManagedUserProfile.groups"
:editable-groups="editableGroups"
+ :airavata-internal-user-id="managedUserProfile.airavataInternalUserId"
@input="groupsUpdated"
/>
</template>
diff --git a/django_airavata/apps/admin/static/django_airavata_admin/src/components/users/UserGroupMembershipEditor.vue b/django_airavata/apps/admin/static/django_airavata_admin/src/components/users/UserGroupMembershipEditor.vue
index 2695827..37bee7c 100644
--- a/django_airavata/apps/admin/static/django_airavata_admin/src/components/users/UserGroupMembershipEditor.vue
+++ b/django_airavata/apps/admin/static/django_airavata_admin/src/components/users/UserGroupMembershipEditor.vue
@@ -41,6 +41,10 @@ export default {
type: Array,
required: true
},
+ airavataInternalUserId: {
+ type: String,
+ required: true
+ },
editableGroups: {
type: Array,
required: true
@@ -112,7 +116,9 @@ export default {
return {
text: group.name,
value: group.id,
- disabled: !group.userHasWriteAccess
+ disabled:
+ !group.userHasWriteAccess ||
+ group.ownerId === this.airavataInternalUserId
};
}
}