You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airavata.apache.org by nd...@apache.org on 2016/08/12 17:38:13 UTC
airavata-php-gateway git commit: Bug Fix
Repository: airavata-php-gateway
Updated Branches:
refs/heads/develop b5378241e -> dd2b78a55
Bug Fix
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/dd2b78a5
Tree: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/tree/dd2b78a5
Diff: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/diff/dd2b78a5
Branch: refs/heads/develop
Commit: dd2b78a554639f440205bf6f06ed7bc924923453
Parents: b537824
Author: Nipurn Doshi <ni...@gmail.com>
Authored: Fri Aug 12 10:37:29 2016 -0700
Committer: Nipurn Doshi <ni...@gmail.com>
Committed: Fri Aug 12 10:37:29 2016 -0700
----------------------------------------------------------------------
app/libraries/AdminUtilities.php | 4 ++--
.../partials/compute-resource-preferences.blade.php | 14 ++++++++++----
2 files changed, 12 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/dd2b78a5/app/libraries/AdminUtilities.php
----------------------------------------------------------------------
diff --git a/app/libraries/AdminUtilities.php b/app/libraries/AdminUtilities.php
index 9baf9cb..5d27f2a 100644
--- a/app/libraries/AdminUtilities.php
+++ b/app/libraries/AdminUtilities.php
@@ -29,13 +29,13 @@ class AdminUtilities
$gateway->gatewayId = $inputs["gateway-name"];
$gateway->gatewayApprovalStatus = GatewayApprovalStatus::REQUESTED;
if( strpos($inputs["domain"], "//") != false)
- $inputs["domain"] = substr( $inputs["domain"], 1 + strpos($inputs["domain"], "//"));
+ $inputs["domain"] = substr( $inputs["domain"], 2 + strpos($inputs["domain"], "//"));
$gateway->domain = $inputs["domain"];
$gateway->gatewayName = $inputs["gateway-name"];
$gateway->emailAddress = $inputs["email-address"];
$gateway->gatewayAcronym = $inputs["gateway-acronym"];
if( strpos($inputs["gateway-url"], "//") != false)
- $inputs["gateway-url"] = substr( $inputs["gateway-url"], 1 + strpos($inputs["gateway-url"], "//"));
+ $inputs["gateway-url"] = substr( $inputs["gateway-url"], 2 + strpos($inputs["gateway-url"], "//"));
$gateway->gatewayURL = $inputs["gateway-url"];
$gateway->gatewayAdminFirstName = $inputs["admin-firstname"];
$gateway->gatewayAdminLastName = $inputs["admin-lastname"];
http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/dd2b78a5/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 ca2566d..3b12a3e 100644
--- a/app/views/partials/compute-resource-preferences.blade.php
+++ b/app/views/partials/compute-resource-preferences.blade.php
@@ -134,18 +134,24 @@
<div class="form-group col-md-6">
<label class="control-label col-md-3">Reservation Start Time</label>
- <div class="col-md-9">
- <input type="text" id="datetimepicker1" name="qualityOfService" class="form-control"
+ <div class="col-md-9 input-group date" id="datetimepicker1">
+ <input type="text" name="reservationStartTime" class="form-control"
value="@if( isset( $preferences) ){{$preferences->qualityOfService}}@endif"/>
+ <span class="input-group-addon">
+ <span class="glyphicon glyphicon-calendar"></span>
+ </span>
</div>
</div>
<div class="form-group col-md-6">
<label class="control-label col-md-3">Reservation End Time</label>
- <div class="col-md-9">
- <input type="text" id="datetimepicker2" name="reservationEndTime" class="form-control"
+ <div class="col-md-9 input-group date" id="datetimepicker2">
+ <input type="text" name="reservationEndTime" class="form-control"
value="@if( isset( $preferences) ){{$preferences->reservationEndTime}}@endif"/>
+ <span class="input-group-addon">
+ <span class="glyphicon glyphicon-calendar"></span>
+ </span>
</div>
</div>