Repository: airavata-php-gateway Updated Branches: refs/heads/develop 3f22c2ace -> 1a74b3921
Fix for AIRAVATA-2061 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/1a74b392 Tree: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/tree/1a74b392 Diff: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/diff/1a74b392 Branch: refs/heads/develop Commit: 1a74b3921a191b3a803ed76ec1372763b22f31eb Parents: 3f22c2a Author: Nipurn Doshi <[email protected]> Authored: Sat Aug 27 13:54:24 2016 -0700 Committer: Nipurn Doshi <[email protected]> Committed: Sat Aug 27 13:54:24 2016 -0700 ---------------------------------------------------------------------- app/views/partials/compute-resource-preferences.blade.php | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/1a74b392/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 9e23fe8..18077f9 100644 --- a/app/views/partials/compute-resource-preferences.blade.php +++ b/app/views/partials/compute-resource-preferences.blade.php @@ -130,13 +130,12 @@ value="@if( isset( $preferences) ){{$preferences->reservation}}@endif"/> </div> </div> - <div class="form-group col-md-6"> <label class="control-label col-md-3">Reservation Start Time</label> <div class="input-group date datetimepicker1"> <input type="text" name="reservationStartTime" class="form-control" - value="@if( isset( $preferences) ){{$preferences->reservationStartTime}}@endif"/> + value="@if( isset( $preferences) ){{date('m/d/Y h:i:s A',$preferences->reservationStartTime) }}@endif"/> <span class="input-group-addon"> <span class="glyphicon glyphicon-calendar"></span> </span> @@ -148,7 +147,7 @@ <div class="input-group date datetimepicker2"> <input type="text" name="reservationEndTime" class="form-control" - value="@if( isset( $preferences) ){{ date('mm/dd/yyyy h:i:s A T",$preferences->reservationEndTime) }}@endif"/> + value="@if( isset( $preferences) ){{date('m/d/Y h:i:s A',$preferences->reservationEndTime) }}@endif"/> <span class="input-group-addon"> <span class="glyphicon glyphicon-calendar"></span> </span>
