airavata-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From scnakand...@apache.org
Subject [3/7] airavata-php-gateway git commit: Fixing Compute resource specific token set issue
Date Wed, 30 Mar 2016 17:49:55 GMT
Fixing Compute resource specific token set issue


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

Branch: refs/heads/master
Commit: 89fda840b66f00ec2dd9bc0aed4097b3cc80be24
Parents: 3a92859
Author: Nipurn Doshi <nipunhere@gmail.com>
Authored: Wed Mar 30 10:17:31 2016 -0400
Committer: Nipurn Doshi <nipunhere@gmail.com>
Committed: Wed Mar 30 10:17:31 2016 -0400

----------------------------------------------------------------------
 app/libraries/CRUtilities.php                             |  1 -
 app/views/partials/compute-resource-preferences.blade.php | 10 ++--------
 2 files changed, 2 insertions(+), 9 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/89fda840/app/libraries/CRUtilities.php
----------------------------------------------------------------------
diff --git a/app/libraries/CRUtilities.php b/app/libraries/CRUtilities.php
index 2c2416d..ca0ffa2 100755
--- a/app/libraries/CRUtilities.php
+++ b/app/libraries/CRUtilities.php
@@ -167,7 +167,6 @@ class CRUtilities
                 $localSub = Airavata::addLocalSubmissionDetails(Session::get('authz-token'),
$computeResource->computeResourceId, 0, $localJobSubmission);
                 return $localSub;
             }
-
         } else if ($inputs["jobSubmissionProtocol"] == JobSubmissionProtocol::SSH) {
             $resourceManager = new ResourceJobManager(array(
                 "resourceJobManagerType" => $inputs["resourceJobManagerType"],

http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/89fda840/app/views/partials/compute-resource-preferences.blade.php
----------------------------------------------------------------------
diff --git a/app/views/partials/compute-resource-preferences.blade.php b/app/views/partials/compute-resource-preferences.blade.php
index 63413c2..109a8e2 100644
--- a/app/views/partials/compute-resource-preferences.blade.php
+++ b/app/views/partials/compute-resource-preferences.blade.php
@@ -87,16 +87,10 @@
 
     <div class="col-md-9">
         <select class="form-control gateway-credential-store-token" name="resourceSpecificCredentialStoreToken"
>
-            @if( isset( $preferences) )
+            <option value="">Select a Credential Token from Store</option>
             @foreach( $tokens as $token => $publicKey)
-                <option value="{{$token}}" @if( $token == $preferences->resourceSpecificCredentialStoreToken)
selected @endif >{{$token}}</option>
+                <option value="{{$token}}" @if( isset( $preferences) ) @if( $token ==
$preferences->resourceSpecificCredentialStoreToken) selected @endif @endif>{{$token}}</option>
             @endforeach
-            @else
-                <option value="">Select a Credential Token from Store</option>
-                @foreach( $tokens as $token => $publicKey)
-                <option value="{{$token}}">{{$token}}</option>
-                @endforeach
-            @endif
             <option value="">DO-NO-SET</option>
         </select>
         <!--


Mime
View raw message