[airavata-django-portal] 01/02: Get name of compute resource from computeResourceId

[ma...@apache.org]

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 57cf8720340057d2a0c731f9c7e5118931591838
Author: Marcus Christie <ma...@iu.edu>
AuthorDate: Fri Apr 20 10:52:53 2018 -0400

    Get name of compute resource from computeResourceId
---
 .../GroupComputeResourcePreference.vue                         | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/django_airavata/apps/admin/static/django_airavata_admin/src/components/admin/group_resource_preferences/GroupComputeResourcePreference.vue b/django_airavata/apps/admin/static/django_airavata_admin/src/components/admin/group_resource_preferences/GroupComputeResourcePreference.vue
index cf05916..ce85ca3 100644
--- a/django_airavata/apps/admin/static/django_airavata_admin/src/components/admin/group_resource_preferences/GroupComputeResourcePreference.vue
+++ b/django_airavata/apps/admin/static/django_airavata_admin/src/components/admin/group_resource_preferences/GroupComputeResourcePreference.vue
@@ -1,10 +1,10 @@
 <template>
   <div class="new_app">
     <div class="new_app_header">
-      <h3 style="display: inline-block">Group Resource Profiles</h3>
+      <h3 style="display: inline-block">Group Resource Profile</h3>
       <div class="new-application-tab-main">
         <div class="entry">
-          <div class="heading">Group Resource Profile Name</div>
+          <div class="heading">Name</div>
           <input type="text" v-model="data.groupResourceProfileName"/>
         </div>
         <div class="entry">
@@ -19,7 +19,7 @@
           <a class="list-item" v-for="computePreference,index in data.computePreferences" v-bind:key="index"
              v-on:click="computePreferenceClickHandler(index)">
             <span v-if="computePreference.groupResourceProfileId">
-              {{computePreference.groupResourceProfileId}}
+              {{getComputeResourceName(computePreference.computeResourceId)}}
             </span>
             <span v-else class="un-saved">
               Un Saved Compute Preference {{index}}
@@ -134,6 +134,10 @@
             index: index
           }
         });
+      },
+      getComputeResourceName: function (computeResourceId) {
+        // TODO: load compute resources to get the real name
+        return (computeResourceId && computeResourceId.indexOf("_") > 0) ? computeResourceId.split("_")[0] : computeResourceId;
       }
     }
   }

-- 
To stop receiving notification emails like this one, please contact
machristie@apache.org.