airavata-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ndo...@apache.org
Subject airavata-php-gateway git commit: Fix for job submission interfaces not having a resource job manager object attached.
Date Mon, 21 Mar 2016 23:22:09 GMT
Repository: airavata-php-gateway
Updated Branches:
  refs/heads/develop e674a1e88 -> 24345b7dc


Fix for job submission interfaces not having a resource job manager object attached.


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

Branch: refs/heads/develop
Commit: 24345b7dc806cc4b38a9237b46275a9db2daa831
Parents: e674a1e
Author: Nipurn Doshi <nipunhere@gmail.com>
Authored: Mon Mar 21 19:21:33 2016 -0400
Committer: Nipurn Doshi <nipunhere@gmail.com>
Committed: Mon Mar 21 19:21:33 2016 -0400

----------------------------------------------------------------------
 .../partials/resource-job-manager.blade.php     | 88 ++++++++++----------
 app/views/resource/edit.blade.php               |  2 +-
 2 files changed, 47 insertions(+), 43 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/24345b7d/app/views/partials/resource-job-manager.blade.php
----------------------------------------------------------------------
diff --git a/app/views/partials/resource-job-manager.blade.php b/app/views/partials/resource-job-manager.blade.php
index d6b6242..8780c24 100644
--- a/app/views/partials/resource-job-manager.blade.php
+++ b/app/views/partials/resource-job-manager.blade.php
@@ -1,45 +1,49 @@
-<div class="select-resource-manager-type">
-    <div class="form-group required">
-        <label class="control-label">Select resource manager type</label>
-        <select name="resourceJobManagerType" class="form-control selected-resource-manager"
-                required="required">
-            @foreach( $resourceJobManagerTypes as $index => $rJmT)
-            <option value="{{ $index }}"
+@if( isset( $JSI) )
+    @if( isset( $JSI->resourceJobManager))
+    <div class="select-resource-manager-type">
+        <div class="form-group required">
+            <label class="control-label">Select resource manager type</label>
+            <select name="resourceJobManagerType" class="form-control selected-resource-manager"
+                    required="required">
+                @foreach( $resourceJobManagerTypes as $index => $rJmT)
+                <option value="{{ $index }}"
+                    @if( isset( $JSI) )
+                        @if( $JSI->resourceJobManager->resourceJobManagerType == $index
) selected @endif
+                    @endif >
+                    {{ $rJmT }}</option>
+                @endforeach
+            </select>
+        </div>
+        <div class="form-group">
+            <label class="control-label">Push Monitoring End Point</label>
+            <input type="text" class="form-control" name="pushMonitoringEndpoint"
                 @if( isset( $JSI) )
-                    @if( $JSI->resourceJobManager->resourceJobManagerType == $index
) selected @endif
-                @endif >
-                {{ $rJmT }}</option>
+                   value="{{ $JSI->resourceJobManager->pushMonitoringEndpoint }}"/>
+                @endif
+        </div>
+        <div class="form-group">
+            <label class="control-label">Job Manager Bin Path</label>
+            <input type="text" class="form-control" name="jobManagerBinPath"
+                @if( isset( $JSI) )
+                   value="{{ $JSI->resourceJobManager->jobManagerBinPath }}"/>
+                @endif
+        </div>
+        <div class="form-group">
+            <h3>Job Manager Commands</h3>
+            @foreach( $jobManagerCommands as $index => $jmc)
+            <label class="control-label">{{ $jmc }}</label>
+            <input class="form-control" name="jobManagerCommands[{{ $index }}]" placeholder="{{
$jmc }}"
+                   value="@if( isset( $JSI->resourceJobManager->jobManagerCommands[$index]
) ){{$JSI->resourceJobManager->jobManagerCommands[$index]}}@endif"/>
             @endforeach
-        </select>
-    </div>
-    <div class="form-group">
-        <label class="control-label">Push Monitoring End Point</label>
-        <input type="text" class="form-control" name="pushMonitoringEndpoint"
-            @if( isset( $JSI) )
-               value="{{ $JSI->resourceJobManager->pushMonitoringEndpoint }}"/>
-            @endif
-    </div>
-    <div class="form-group">
-        <label class="control-label">Job Manager Bin Path</label>
-        <input type="text" class="form-control" name="jobManagerBinPath"
-            @if( isset( $JSI) )
-               value="{{ $JSI->resourceJobManager->jobManagerBinPath }}"/>
-            @endif
-    </div>
-    <div class="form-group">
-        <h3>Job Manager Commands</h3>
-        @foreach( $jobManagerCommands as $index => $jmc)
-        <label class="control-label">{{ $jmc }}</label>
-        <input class="form-control" name="jobManagerCommands[{{ $index }}]" placeholder="{{
$jmc }}"
-               value="@if( isset( $JSI->resourceJobManager->jobManagerCommands[$index]
) ){{$JSI->resourceJobManager->jobManagerCommands[$index]}}@endif"/>
-        @endforeach
-    </div>
-    <div class="form-group">
-        <h3>Parallelism Prefixes</h3>
-        @foreach( $parallelismTypes as $index => $pt)
-        <label class="control-label">{{ $pt }}</label>
-        <input class="form-control" name="parallelismPrefix[{{ $index }}]" placeholder="{{
$pt }}"
-               value="@if( isset( $JSI->resourceJobManager->parallelismPrefix[$index]
) ){{$JSI->resourceJobManager->parallelismPrefix[$index]}}@endif"/>
-        @endforeach
+        </div>
+        <div class="form-group">
+            <h3>Parallelism Prefixes</h3>
+            @foreach( $parallelismTypes as $index => $pt)
+            <label class="control-label">{{ $pt }}</label>
+            <input class="form-control" name="parallelismPrefix[{{ $index }}]" placeholder="{{
$pt }}"
+                   value="@if( isset( $JSI->resourceJobManager->parallelismPrefix[$index]
) ){{$JSI->resourceJobManager->parallelismPrefix[$index]}}@endif"/>
+            @endforeach
+        </div>
     </div>
-</div>
\ No newline at end of file
+    @endif
+@endif
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/24345b7d/app/views/resource/edit.blade.php
----------------------------------------------------------------------
diff --git a/app/views/resource/edit.blade.php b/app/views/resource/edit.blade.php
index 522e7e5..dbc33fe 100644
--- a/app/views/resource/edit.blade.php
+++ b/app/views/resource/edit.blade.php
@@ -230,7 +230,7 @@
                                     "parallelismTypes" => $parallelismTypes
                                 )
                             )
-                @elseif( $selectedJspIndex == $jobSubmissionProtocolsObject::SSH || $jobSubmissionProtocolsObject::SSH_FORK)
+                @elseif( $selectedJspIndex == $jobSubmissionProtocolsObject::SSH || $selectedJspIndex
== $jobSubmissionProtocolsObject::SSH_FORK)
                 <div class="form-group required">
                     <label class="control-label">Select Security Protocol</label>
                     <select name="securityProtocol" required="required">


Mime
View raw message