Repository: airavata-php-gateway Updated Branches: refs/heads/develop d8cb5603c -> 1011cf4e7
fixing bug in default walltime calculation 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/1011cf4e Tree: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/tree/1011cf4e Diff: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/diff/1011cf4e Branch: refs/heads/develop Commit: 1011cf4e76cfc359bc2fcd63a5ffb287ea5cf0e1 Parents: d8cb560 Author: scnakandala <[email protected]> Authored: Wed May 31 15:31:35 2017 -0400 Committer: scnakandala <[email protected]> Committed: Wed May 31 15:31:35 2017 -0400 ---------------------------------------------------------------------- app/controllers/ExperimentController.php | 1 - app/views/partials/experiment-queue-block.blade.php | 4 +--- 2 files changed, 1 insertion(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/1011cf4e/app/controllers/ExperimentController.php ---------------------------------------------------------------------- diff --git a/app/controllers/ExperimentController.php b/app/controllers/ExperimentController.php index f10109e..131fa1d 100755 --- a/app/controllers/ExperimentController.php +++ b/app/controllers/ExperimentController.php @@ -485,7 +485,6 @@ class ExperimentController extends BaseController if($correctAppDeployment != null){ $appDeploymentDefaults['nodeCount'] = $correctAppDeployment->defaultNodeCount; $appDeploymentDefaults['cpuCount'] = $correctAppDeployment->defaultCPUCount; - $appDeploymentDefaults['wallTimeLimit'] = $wallTimeLimit; $appDeploymentDefaults['queueName'] = $correctAppDeployment->defaultQueueName; } http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/1011cf4e/app/views/partials/experiment-queue-block.blade.php ---------------------------------------------------------------------- diff --git a/app/views/partials/experiment-queue-block.blade.php b/app/views/partials/experiment-queue-block.blade.php index b3c73a0..b78d391 100644 --- a/app/views/partials/experiment-queue-block.blade.php +++ b/app/views/partials/experiment-queue-block.blade.php @@ -228,9 +228,7 @@ else $(".walltime-count").parent().addClass("hide"); - if(appDefaults['wallTimeLimit'] > 0){ - $("#wall-time").val(appDefaults['wallTimeLimit']); - }else if(queues[i]['defaultWalltime'] > 0) { + if(queues[i]['defaultWalltime'] > 0) { $("#wall-time").val(queues[i]['defaultWalltime']); }else{ $("#wall-time").val(queueDefaults['wallTimeLimit']);
