Repository: airavata-php-gateway Updated Branches: refs/heads/develop 6a1bc1791 -> 074e3eb8b
WIP 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/074e3eb8 Tree: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/tree/074e3eb8 Diff: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/diff/074e3eb8 Branch: refs/heads/develop Commit: 074e3eb8b6214948c52cd651cb96cb9c59a1b352 Parents: 6a1bc17 Author: scnakandala <[email protected]> Authored: Tue May 23 11:47:24 2017 -0400 Committer: scnakandala <[email protected]> Committed: Tue May 23 11:47:24 2017 -0400 ---------------------------------------------------------------------- app/views/partials/deployment-block.blade.php | 1 + public/js/deployment.js | 18 +++++++++++++++--- 2 files changed, 16 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/074e3eb8/app/views/partials/deployment-block.blade.php ---------------------------------------------------------------------- diff --git a/app/views/partials/deployment-block.blade.php b/app/views/partials/deployment-block.blade.php index a930d1c..98df3c4 100644 --- a/app/views/partials/deployment-block.blade.php +++ b/app/views/partials/deployment-block.blade.php @@ -6,6 +6,7 @@ --> @if( isset( $deploymentObject) ) <input type="hidden" name="app-deployment-id" value="{{$deploymentObject->appDeploymentId}}"/> +<input type="hidden" name="app-deployment-object" value="{{$deploymentObject}}"/> @endif <div class="form-group required"> <label class="control-label">Application Module</label> http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/074e3eb8/public/js/deployment.js ---------------------------------------------------------------------- diff --git a/public/js/deployment.js b/public/js/deployment.js index 36bcc05..fef92c6 100644 --- a/public/js/deployment.js +++ b/public/js/deployment.js @@ -73,11 +73,23 @@ $( document).ready( function(){ $("#edit-app-deployment-block").on('change', '.computeHostId', function () { var computeResourceCompleteList = $.parseJSON($("#compute-resource-full-objects").val()); - for(var i = 0; i< computeResourceCompleteList.length; i++){ + var appDeploymentObject = $.parseJSON($("#app-deployment-object").val()); + for(i = 0; i< computeResourceCompleteList.length; i++){ computeResource = computeResourceCompleteList[i]; if(computeResource.computeResourceId.startsWith(this.value)){ - $queues = computeResource.batchQueues; - console.log($queues); + queues = computeResource.batchQueues; + if(queues != null){ + for(j=0; j<queues.length; j++){ + queue = queues[j]; + if(appDeploymentObject.defaultQueueName == queue.queueName){ + $("#edit-app-deployment-block.default-queue-name-select").append($("<option></option>") + .attr("value", queue.queueName).attr("selected", true).text(queue.queueName)); + }else{ + $("#edit-app-deployment-block.default-queue-name-select").append($("<option></option>") + .attr("value", queue.queueName).text(queue.queueName)); + } + } + } } } });
