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 2017/01/19 19:50:36 UTC

[03/10] airavata-php-gateway git commit: AIRAVATA-1397 Couple small fixes I noticed

AIRAVATA-1397 Couple small fixes I noticed

* fix for updating memory when editing an experiment
* removing unused "selected-queue" form parameter


Project: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/commit/6cdc2a11
Tree: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/tree/6cdc2a11
Diff: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/diff/6cdc2a11

Branch: refs/heads/develop
Commit: 6cdc2a1188960b1b82c65df157b3c20f7c8d2342
Parents: d0af4e3
Author: Marcus Christie <ma...@apache.org>
Authored: Fri Jan 13 17:06:15 2017 -0500
Committer: Marcus Christie <ma...@apache.org>
Committed: Fri Jan 13 17:06:15 2017 -0500

----------------------------------------------------------------------
 app/libraries/ExperimentUtilities.php          | 2 +-
 app/views/partials/experiment-inputs.blade.php | 2 --
 2 files changed, 1 insertion(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/6cdc2a11/app/libraries/ExperimentUtilities.php
----------------------------------------------------------------------
diff --git a/app/libraries/ExperimentUtilities.php b/app/libraries/ExperimentUtilities.php
index a4fee3b..0b89df1 100755
--- a/app/libraries/ExperimentUtilities.php
+++ b/app/libraries/ExperimentUtilities.php
@@ -1282,7 +1282,7 @@ class ExperimentUtilities
         $schedulingUpdated->totalCPUCount = $input['cpu-count'];
         //$schedulingUpdated->numberOfThreads = $input['threads'];
         $schedulingUpdated->wallTimeLimit = $input['wall-time'];
-        //$schedulingUpdated->totalPhysicalMemory = $input['memory'];
+        $schedulingUpdated->totalPhysicalMemory = $input['total-physical-memory'];
 
         /*
         switch ($_POST['compute-resource'])

http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/6cdc2a11/app/views/partials/experiment-inputs.blade.php
----------------------------------------------------------------------
diff --git a/app/views/partials/experiment-inputs.blade.php b/app/views/partials/experiment-inputs.blade.php
index dfe9d6c..bd3ef79 100644
--- a/app/views/partials/experiment-inputs.blade.php
+++ b/app/views/partials/experiment-inputs.blade.php
@@ -81,8 +81,6 @@
             <div class="loading-img text-center hide">
                 <img src="../assets/ajax-loader.gif"/>
             </div>
-            <input type="hidden" name="selected-queue"
-                   value="@if(isset($expInputs['expVal']) ){{ $expInputs['expVal']['scheduling']->queueName }} @endif"/>
 
             <div class="queue-view">
                 @if(isset($expInputs['expVal']) )