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 2018/09/28 16:02:18 UTC
[airavata-django-portal] branch master updated: AIRAVATA-2840
Removing filtering out admin groups (for now at least)
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
The following commit(s) were added to refs/heads/master by this push:
new 110549c AIRAVATA-2840 Removing filtering out admin groups (for now at least)
110549c is described below
commit 110549cabbb428d56d9cd881624e338388c9f597
Author: Marcus Christie <ma...@iu.edu>
AuthorDate: Fri Sep 28 12:01:59 2018 -0400
AIRAVATA-2840 Removing filtering out admin groups (for now at least)
---
django_airavata/static/common/js/components/ShareButton.vue | 8 +-------
.../static/common/js/components/SharedEntityEditor.vue | 13 ++-----------
2 files changed, 3 insertions(+), 18 deletions(-)
diff --git a/django_airavata/static/common/js/components/ShareButton.vue b/django_airavata/static/common/js/components/ShareButton.vue
index e81df2d..5231c3e 100644
--- a/django_airavata/static/common/js/components/ShareButton.vue
+++ b/django_airavata/static/common/js/components/ShareButton.vue
@@ -64,14 +64,8 @@ export default {
: null;
},
filteredGroupPermissions: function() {
- // TODO: make this an option? Maybe don't filter the admin groups but add
- // an option to make it so that they can't be removed
return this.localSharedEntity && this.localSharedEntity.groupPermissions
- ? this.localSharedEntity.groupPermissions.filter(
- grp =>
- !grp.group.isGatewayAdminsGroup &&
- !grp.group.isReadOnlyGatewayAdminsGroup
- )
+ ? this.localSharedEntity.groupPermissions
: [];
},
groupNames: function() {
diff --git a/django_airavata/static/common/js/components/SharedEntityEditor.vue b/django_airavata/static/common/js/components/SharedEntityEditor.vue
index a96405a..12ec044 100644
--- a/django_airavata/static/common/js/components/SharedEntityEditor.vue
+++ b/django_airavata/static/common/js/components/SharedEntityEditor.vue
@@ -94,11 +94,7 @@ export default {
},
filteredGroupPermissions: function() {
return this.data && this.data.groupPermissions
- ? this.data.groupPermissions.filter(
- grp =>
- !grp.group.isGatewayAdminsGroup &&
- !grp.group.isReadOnlyGatewayAdminsGroup
- )
+ ? this.data.groupPermissions
: [];
},
groupsCount: function() {
@@ -124,12 +120,7 @@ export default {
groupPerm => groupPerm.group.id
);
return this.groups
- .filter(
- group =>
- currentGroupIds.indexOf(group.id) < 0 &&
- !group.isGatewayAdminsGroup &&
- !group.isReadOnlyGatewayAdminsGroup
- )
+ .filter(group => currentGroupIds.indexOf(group.id) < 0)
.map(group => {
return {
id: group.id,