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/11/19 21:30:15 UTC

[airavata-django-portal] 01/03: Remove gateway id from owner username

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 885de3025bb1581852150f775512c4f93bed6d81
Author: Marcus Christie <ma...@iu.edu>
AuthorDate: Mon Nov 19 15:30:24 2018 -0500

    Remove gateway id from owner username
---
 .../django_airavata_groups/js/group_components/GroupListItem.vue | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/django_airavata/apps/groups/static/django_airavata_groups/js/group_components/GroupListItem.vue b/django_airavata/apps/groups/static/django_airavata_groups/js/group_components/GroupListItem.vue
index c8de521..518fd1b 100644
--- a/django_airavata/apps/groups/static/django_airavata_groups/js/group_components/GroupListItem.vue
+++ b/django_airavata/apps/groups/static/django_airavata_groups/js/group_components/GroupListItem.vue
@@ -5,7 +5,7 @@
             <b-badge v-if="group.isReadOnlyGatewayAdminsGroup">Read Only Admins</b-badge>
             <b-badge v-if="group.isDefaultGatewayUsersGroup">Default</b-badge>
         </td>
-        <td>{{ group.ownerId }}</td>
+        <td>{{ ownerUsername }}</td>
         <td>{{ group.description }}</td>
         <td>
             <a v-if="group.isOwner || group.isAdmin"
@@ -53,6 +53,13 @@ export default {
                 && this.group.isGatewayAdminsGroup === false
                 && this.group.isReadOnlyGatewayAdminsGroup === false
                 && this.group.isDefaultGatewayUsersGroup === false;
+        },
+        ownerUsername() {
+          const lastAtIndex = this.group.ownerId.lastIndexOf("@");
+          if (lastAtIndex > 0) {
+            return this.group.ownerId.substring(0, lastAtIndex);
+          }
+          return this.group.ownerId;
         }
     },
     methods: {