Repository: airavata-php-gateway Updated Branches: refs/heads/develop e7f85dfa5 -> 877267e8b
handling default queue setting 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/877267e8 Tree: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/tree/877267e8 Diff: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/diff/877267e8 Branch: refs/heads/develop Commit: 877267e8b2562b73f5923f63fb612bba3bae50d5 Parents: e7f85df Author: scnakandala <[email protected]> Authored: Mon May 22 13:10:48 2017 -0400 Committer: scnakandala <[email protected]> Committed: Mon May 22 13:10:48 2017 -0400 ---------------------------------------------------------------------- app/controllers/ComputeResourceController.php | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/877267e8/app/controllers/ComputeResourceController.php ---------------------------------------------------------------------- diff --git a/app/controllers/ComputeResourceController.php b/app/controllers/ComputeResourceController.php index 1f62a5a..afbdaa5 100755 --- a/app/controllers/ComputeResourceController.php +++ b/app/controllers/ComputeResourceController.php @@ -122,7 +122,17 @@ class ComputeResourceController extends BaseController ); $computeDescription = CRUtilities::get_compute_resource(Input::get("crId")); - $computeDescription->batchQueues[] = CRUtilities::createQueueObject($queue); + $updatedQueues = []; + if($queue["isDefaultQueue"]){ + foreach($computeDescription->batchQueues as $aQueue){ + $aQueue->isDefaultQueue = false; + $updatedQueues[] = $aQueue; + } + }else{ + $updatedQueues = $computeDescription->batchQueues; + } + $updatedQueues[] = CRUtilities::createQueueObject($queue); + $computeDescription->batchQueues = $updatedQueues; $computeResource = CRUtilities::register_or_update_compute_resource($computeDescription, true); //var_dump( $computeResource); exit; $tabName = "#tab-queues";
