airavata-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From scnakand...@apache.org
Subject airavata-php-gateway git commit: WIP
Date Tue, 23 May 2017 16:37:14 GMT
Repository: airavata-php-gateway
Updated Branches:
  refs/heads/develop 8c504a0a4 -> 127c39851


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/127c3985
Tree: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/tree/127c3985
Diff: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/diff/127c3985

Branch: refs/heads/develop
Commit: 127c398510ed588162789206ffe02a5c7230b8f8
Parents: 8c504a0
Author: scnakandala <supun.nakandala@gmail.com>
Authored: Tue May 23 12:37:11 2017 -0400
Committer: scnakandala <supun.nakandala@gmail.com>
Committed: Tue May 23 12:37:11 2017 -0400

----------------------------------------------------------------------
 app/views/application/deployment.blade.php    |  2 +-
 app/views/partials/deployment-block.blade.php | 10 ++++++++++
 2 files changed, 11 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/127c3985/app/views/application/deployment.blade.php
----------------------------------------------------------------------
diff --git a/app/views/application/deployment.blade.php b/app/views/application/deployment.blade.php
index 1b1ed85..df3c6a9 100644
--- a/app/views/application/deployment.blade.php
+++ b/app/views/application/deployment.blade.php
@@ -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,
'computeResourceFullObjects' => $computeResourceFullObjects) )
                         </div>
                     </div>
                 </div>

http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/127c3985/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 58b80fa..81bd571 100644
--- a/app/views/partials/deployment-block.blade.php
+++ b/app/views/partials/deployment-block.blade.php
@@ -162,5 +162,15 @@
 <div class="form-group required">
     <label class="control-label">Default Queue Name</label>
     <select name="defaultQueueName" class="form-control default-queue-name-select" readonly>
+        @foreach($computeResourceFullObjects as $computeResourceFullObject)
+            @if(0 === strpos($computeResourceFullObject->computeResourceId, $deploymentObject->computeHostId))
+                <?php $queues = $computeResourceFullObject->batchQueues;?>
+                @foreach( $queues as $queue)
+                    <option value="{{ $queue->queueName }}"
+                            @if( isset( $deploymentObject) ) @if( $queue->queueName ==
$deploymentObject->defaultQueueName) selected @endif
+                            @endif>{{ $queue->queueName }}</option>
+                @endforeach
+            @endif
+        @endforeach
     </select>
 </div>
\ No newline at end of file


Mime
View raw message