[airavata-django-portal] branch develop updated: AIRAVATA-3344 Don't show memory option if max is 0

[machristie]

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


The following commit(s) were added to refs/heads/develop by this push:
     new 4613b8d  AIRAVATA-3344 Don't show memory option if max is 0
     new 539596b  Merge branch 
'AIRAVATA-3344-add-total-physical-memory-to-queue-settings' into develop
4613b8d is described below

commit 4613b8d338f0c0f353cda0222944eaed292306ab
Author: Marcus Christie <machris...@apache.org>
AuthorDate: Mon Jul 13 11:41:54 2020 -0400

    AIRAVATA-3344 Don't show memory option if max is 0
---
 .../js/components/experiment/QueueSettingsEditor.vue             | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git 
a/django_airavata/apps/workspace/static/django_airavata_workspace/js/components/experiment/QueueSettingsEditor.vue
 
b/django_airavata/apps/workspace/static/django_airavata_workspace/js/components/experiment/QueueSettingsEditor.vue
index 93d7231..1c41ed2 100644
--- 
a/django_airavata/apps/workspace/static/django_airavata_workspace/js/components/experiment/QueueSettingsEditor.vue
+++ 
b/django_airavata/apps/workspace/static/django_airavata_workspace/js/components/experiment/QueueSettingsEditor.vue
@@ -28,7 +28,7 @@
                   <h3 class="h5 mb-0">{{ data.wallTimeLimit }} minutes</h3>
                   <span class="text-muted text-uppercase">TIME LIMIT</span>
                 </div>
-                <div class="col">
+                <div class="col" v-if="maxPhysicalMemory > 0">
                   <h3 class="h5 mb-0">{{ data.totalPhysicalMemory }} MB</h3>
                   <span class="text-muted text-uppercase">PHYSICAL 
MEMORY</span>
                 </div>
@@ -126,6 +126,7 @@
             </div>
           </b-form-group>
           <b-form-group
+            v-if="maxPhysicalMemory > 0"
             label="Total Physical Memory"
             label-for="total-physical-memory"
             :invalid-feedback="getValidationFeedback('totalPhysicalMemory')"
@@ -315,6 +316,9 @@ export default {
       this.data.totalCPUCount = this.getDefaultCPUCount(queueDefault);
       this.data.nodeCount = this.getDefaultNodeCount(queueDefault);
       this.data.wallTimeLimit = this.getDefaultWalltime(queueDefault);
+      if (this.maxPhysicalMemory === 0) {
+        this.data.totalPhysicalMemory = 0;
+      }
     },
     validate() {
       if (!this.valid) {
@@ -339,6 +343,9 @@ export default {
       this.data.totalCPUCount = this.getDefaultCPUCount(defaultQueue);
       this.data.nodeCount = this.getDefaultNodeCount(defaultQueue);
       this.data.wallTimeLimit = this.getDefaultWalltime(defaultQueue);
+      if (this.maxPhysicalMemory === 0) {
+        this.data.totalPhysicalMemory = 0;
+      }
     },
     isQueueInComputeResourcePolicy: function(queueName) {
       if (!this.computeResourcePolicy) {