Repository: airavata-php-gateway Updated Branches: refs/heads/develop 04788e7bc -> 056fa578f
dumping compute resource full objects as a JSON 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/056fa578 Tree: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/tree/056fa578 Diff: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/diff/056fa578 Branch: refs/heads/develop Commit: 056fa578f455cdcc049495c0d714c9cd384638d9 Parents: 04788e7 Author: scnakandala <[email protected]> Authored: Tue May 23 11:00:21 2017 -0400 Committer: scnakandala <[email protected]> Committed: Tue May 23 11:00:21 2017 -0400 ---------------------------------------------------------------------- app/libraries/AppUtilities.php | 5 ++++- app/views/application/deployment.blade.php | 4 ++-- app/views/partials/deployment-block.blade.php | 7 ++++++- 3 files changed, 12 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/056fa578/app/libraries/AppUtilities.php ---------------------------------------------------------------------- diff --git a/app/libraries/AppUtilities.php b/app/libraries/AppUtilities.php index 288c178..e770776 100644 --- a/app/libraries/AppUtilities.php +++ b/app/libraries/AppUtilities.php @@ -136,6 +136,8 @@ class AppUtilities $appDeployments = Airavata::getAllApplicationDeployments(Session::get('authz-token'), Session::get("gateway_id")); //var_dump( $appDeployments); exit; $computeResources = Airavata::getAllComputeResourceNames(Session::get('authz-token')); + $computeResourceFullObjects = CRUtilities::getAllCRObjects(); + $modules = AppUtilities::getAllModules(); $apt = new ApplicationParallelismType(); @@ -143,7 +145,8 @@ class AppUtilities "appDeployments" => $appDeployments, "applicationParallelismTypes" => $apt::$__names, "computeResources" => $computeResources, - "modules" => $modules + "modules" => $modules, + "computeResourceFullObjects" => $computeResourceFullObjects ); } http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/056fa578/app/views/application/deployment.blade.php ---------------------------------------------------------------------- diff --git a/app/views/application/deployment.blade.php b/app/views/application/deployment.blade.php index 89bc604..92eac2f 100644 --- a/app/views/application/deployment.blade.php +++ b/app/views/application/deployment.blade.php @@ -7,7 +7,7 @@ @stop @section('content') - +<input type="hidden" id="compute-resource-full-objects" value="{{ htmlentities( json_encode( $computeResourceFullObjects ) ) }}"/> <div id="wrapper"> <!-- Sidebar Menu Items - These collapse to the responsive navigation menu on small screens --> @include( 'partials/dashboard-block') @@ -63,7 +63,7 @@ <div class="panel-body"> <div class="app-deployment-block"> @include('partials/deployment-block', array( 'deploymentObject' => $deployment, - 'computeResources' => $computeResources, 'modules' => $modules) ) + 'computeResources' => $computeResources, 'modules' => $modules, 'queueNames'=> $queueNames) ) </div> </div> </div> http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/056fa578/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 7d68bb9..1dcf883 100644 --- a/app/views/partials/deployment-block.blade.php +++ b/app/views/partials/deployment-block.blade.php @@ -157,4 +157,9 @@ {{--<label class="control-label">Default Walltime</label>--}} {{--<input type="number" min="0" class="form-control" value="@if( isset( $deploymentObject)){{$deploymentObject->defaultWalltime}}@endif"--}} {{--required readonly maxlength="30" name="defaultWalltime"/>--}} -{{--</div>--}} \ No newline at end of file +{{--</div>--}} +<div class="form-group required"> + <label class="control-label">Default Queue Name</label> + <select name="defaultQueueName" class="form-control" readonly> + </select> +</div> \ No newline at end of file
