airavata-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sma...@apache.org
Subject [12/18] airavata-php-gateway git commit: AIRAVATA-2152 Convert to time value before calling convertLocalToUTC
Date Fri, 28 Oct 2016 20:04:58 GMT
AIRAVATA-2152 Convert to time value before calling convertLocalToUTC


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

Branch: refs/heads/develop
Commit: bce3cc827d35dfd409e387796baccc450a7476c1
Parents: 3a79019
Author: Marcus Christie <machrist@iu.edu>
Authored: Thu Oct 20 11:58:55 2016 -0400
Committer: Marcus Christie <machrist@iu.edu>
Committed: Fri Oct 28 15:04:31 2016 -0400

----------------------------------------------------------------------
 app/libraries/CRUtilities.php  | 4 ++--
 app/libraries/URPUtilities.php | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/bce3cc82/app/libraries/CRUtilities.php
----------------------------------------------------------------------
diff --git a/app/libraries/CRUtilities.php b/app/libraries/CRUtilities.php
index 34066c1..ae3e1ad 100755
--- a/app/libraries/CRUtilities.php
+++ b/app/libraries/CRUtilities.php
@@ -526,9 +526,9 @@ class CRUtilities
     {
         $inputs = Input::all();
         if( $inputs["reservationStartTime"] != "")
-            $inputs["reservationStartTime"] = CommonUtilities::convertLocalToUTC($inputs["reservationStartTime"])
* 1000;
+            $inputs["reservationStartTime"] = CommonUtilities::convertLocalToUTC(strtotime($inputs["reservationStartTime"]))
* 1000;
         if( $inputs["reservationEndTime"] != "")
-            $inputs["reservationEndTime"] = CommonUtilities::convertLocalToUTC($inputs["reservationEndTime"])
* 1000;
+            $inputs["reservationEndTime"] = CommonUtilities::convertLocalToUTC(strtotime($inputs["reservationEndTime"]))
* 1000;
 
         $computeResourcePreferences = new computeResourcePreference($inputs);
 

http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/bce3cc82/app/libraries/URPUtilities.php
----------------------------------------------------------------------
diff --git a/app/libraries/URPUtilities.php b/app/libraries/URPUtilities.php
index ad4529b..ad5c79a 100644
--- a/app/libraries/URPUtilities.php
+++ b/app/libraries/URPUtilities.php
@@ -74,9 +74,9 @@ class URPUtilities
     {
         $inputs = Input::all();
         if( $inputs["reservationStartTime"] != "")
-            $inputs["reservationStartTime"] = CommonUtilities::convertLocalToUTC($inputs["reservationStartTime"])
* 1000;
+            $inputs["reservationStartTime"] = CommonUtilities::convertLocalToUTC(strtotime($inputs["reservationStartTime"]))
* 1000;
         if( $inputs["reservationEndTime"] != "")
-            $inputs["reservationEndTime"] = CommonUtilities::convertLocalToUTC($inputs["reservationEndTime"])
* 1000;
+            $inputs["reservationEndTime"] = CommonUtilities::convertLocalToUTC(strtotime($inputs["reservationEndTime"]))
* 1000;
 
         $userComputeResourcePreference = new UserComputeResourcePreference($inputs);
         $userId = Session::get('username');


Mime
View raw message