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/09/23 07:59:28 UTC
airavata-php-gateway git commit: date field not null
Repository: airavata-php-gateway
Updated Branches:
refs/heads/develop 802e5295d -> 5e16ca779
date field not null
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/5e16ca77
Tree: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/tree/5e16ca77
Diff: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/diff/5e16ca77
Branch: refs/heads/develop
Commit: 5e16ca77996fdfb79b418f1823531c2087816ca9
Parents: 802e529
Author: Nipurn Doshi <ni...@gmail.com>
Authored: Fri Sep 23 00:58:59 2016 -0700
Committer: Nipurn Doshi <ni...@gmail.com>
Committed: Fri Sep 23 00:58:59 2016 -0700
----------------------------------------------------------------------
app/views/admin/manage-gateway.blade.php | 2 ++
app/views/partials/compute-resource-preferences.blade.php | 4 ++--
2 files changed, 4 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/5e16ca77/app/views/admin/manage-gateway.blade.php
----------------------------------------------------------------------
diff --git a/app/views/admin/manage-gateway.blade.php b/app/views/admin/manage-gateway.blade.php
index f971afa..9c5a33d 100644
--- a/app/views/admin/manage-gateway.blade.php
+++ b/app/views/admin/manage-gateway.blade.php
@@ -697,9 +697,11 @@
$(".datetimepicker1").on("dp.change", function (e) {
$('.datetimepicker2').data("DateTimePicker").setMinDate(e.date);
+ $(this).find(".glyphicon-calendar").click();
});
$(".datetimepicker2").on("dp.change", function (e) {
$('.datetimepicker1').data("DateTimePicker").setMaxDate(e.date);
+ $(this).find(".glyphicon-calendar").click();
});
http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/5e16ca77/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 627a485..99fc469 100644
--- a/app/views/partials/compute-resource-preferences.blade.php
+++ b/app/views/partials/compute-resource-preferences.blade.php
@@ -151,7 +151,7 @@ if( isset( $preferences) && $preferences->reservationEndTime != '')
<div class="input-group date datetimepicker1">
<input type="text" name="reservationStartTime" class="form-control"
- value="@if( isset( $preferences) )@if( $preferences->reservationStartTime != ''){{date('m/d/Y h:i:s A', intval( $reservationStartTime))}}@endif @endif"/>
+ value="@if( isset( $preferences) )@if( trim($preferences->reservationStartTime) != '' || $preferences->reservationStartTime != null){{date('m/d/Y h:i:s A', intval( $reservationStartTime))}}@endif @endif"/>
<span class="input-group-addon">
<span class="glyphicon glyphicon-calendar"></span>
</span>
@@ -163,7 +163,7 @@ if( isset( $preferences) && $preferences->reservationEndTime != '')
<div class="input-group date datetimepicker2">
<input type="text" name="reservationEndTime" class="form-control"
- value="@if( isset( $preferences) )@if( $preferences->reservationStartTime != ''){{date('m/d/Y h:i:s A', intval($reservationEndTime))}}@endif @endif"/>
+ value="@if( isset( $preferences) )@if( trim($preferences->reservationEndTime) != ''|| $preferences->reservationStartTime != null){{date('m/d/Y h:i:s A', intval($reservationEndTime))}}@endif @endif"/>
<span class="input-group-addon">
<span class="glyphicon glyphicon-calendar"></span>
</span>