Repository: airavata-php-gateway Updated Branches: refs/heads/develop 1a74b3921 -> ff0bbbddf
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/ff0bbbdd Tree: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/tree/ff0bbbdd Diff: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/diff/ff0bbbdd Branch: refs/heads/develop Commit: ff0bbbddfc30788ba7cdd3335d9752c1bc8b5d6b Parents: 1a74b39 Author: Nipurn Doshi <[email protected]> Authored: Sat Aug 27 14:54:43 2016 -0700 Committer: Nipurn Doshi <[email protected]> Committed: Sat Aug 27 14:54:43 2016 -0700 ---------------------------------------------------------------------- app/controllers/AdminController.php | 3 ++- app/libraries/AdminUtilities.php | 1 + app/libraries/CRUtilities.php | 4 ++-- app/views/admin/manage-gateway.blade.php | 5 +++-- app/views/partials/compute-resource-preferences.blade.php | 4 ++-- app/views/partials/dashboard-block.blade.php | 2 +- 6 files changed, 11 insertions(+), 8 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/ff0bbbdd/app/controllers/AdminController.php ---------------------------------------------------------------------- diff --git a/app/controllers/AdminController.php b/app/controllers/AdminController.php index a151bc3..1c84805 100644 --- a/app/controllers/AdminController.php +++ b/app/controllers/AdminController.php @@ -17,6 +17,7 @@ class AdminController extends BaseController { $gatewayOfUser = ""; Session::put("super-admin", true); $gatewaysInfo = CRUtilities::getAllGateways(); + //var_dump( $gatewaysInfo); exit; $requestedGateways = array(); $gatewayApprovalStatuses = AdminUtilities::get_gateway_approval_statuses(); @@ -99,7 +100,7 @@ class AdminController extends BaseController { public function gatewayView(){ //only for super admin //Session::put("super-admin", true); - $crData = CRUtilities::getEditCRData(); + $gatewaysInfo = CRUtilities::getAllGatewayProfilesData(); $gateways = $gatewaysInfo["gateways"]; $tokens = AdminUtilities::get_all_ssh_tokens(); http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/ff0bbbdd/app/libraries/AdminUtilities.php ---------------------------------------------------------------------- diff --git a/app/libraries/AdminUtilities.php b/app/libraries/AdminUtilities.php index f1d1b33..c9544da 100644 --- a/app/libraries/AdminUtilities.php +++ b/app/libraries/AdminUtilities.php @@ -40,6 +40,7 @@ class AdminUtilities $gateway->identityServerPasswordToken = $inputs["admin-password"]; $gateway->reviewProposalDescription = $inputs["project-details"]; $gateway->gatewayPublicAbstract = $inputs["public-project-description"]; + $userProfile = Session::get("user-profile"); $gateway->requesterUsername = $userProfile["username"]; http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/ff0bbbdd/app/libraries/CRUtilities.php ---------------------------------------------------------------------- diff --git a/app/libraries/CRUtilities.php b/app/libraries/CRUtilities.php index e14bcec..404c6e9 100755 --- a/app/libraries/CRUtilities.php +++ b/app/libraries/CRUtilities.php @@ -531,8 +531,8 @@ class CRUtilities if( $timeDifference > 0) $addOrSubtract = "+"; $inputs = Input::all(); - $inputs["reservationStartTime"] = strtotime( $addOrSubtract . " " . Session::get("user_timezone") . " hours", strtotime( $inputs["reservationStartTime"]) ) * 1000; - $inputs["reservationEndTime"] = strtotime( $addOrSubtract . " " . Session::get("user_timezone") . " hours", strtotime($inputs["reservationEndTime"]) ) * 1000; + $inputs["reservationStartTime"] = strtotime( $inputs["reservationStartTime"]) * 1000; + $inputs["reservationEndTime"] = strtotime($inputs["reservationEndTime"]) * 1000; $computeResourcePreferences = new computeResourcePreference($inputs); if (Config::get('pga_config.airavata')['enable-app-catalog-cache']) { http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/ff0bbbdd/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 3988328..f9c2d6f 100644 --- a/app/views/admin/manage-gateway.blade.php +++ b/app/views/admin/manage-gateway.blade.php @@ -507,11 +507,12 @@ /* making datetimepicker work for reservation start and end date */ $('.datetimepicker1').datetimepicker({ - pick12HourFormat: false + pick12HourFormat: false, + pickTime: false }); $('.datetimepicker2').datetimepicker({ pick12HourFormat: false, - useCurrent: false //Important! See issue #1075 + pickTime: false }); $(".datetimepicker1 input").focus( function(){ http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/ff0bbbdd/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 18077f9..13a8240 100644 --- a/app/views/partials/compute-resource-preferences.blade.php +++ b/app/views/partials/compute-resource-preferences.blade.php @@ -135,7 +135,7 @@ <div class="input-group date datetimepicker1"> <input type="text" name="reservationStartTime" class="form-control" - value="@if( isset( $preferences) ){{date('m/d/Y h:i:s A',$preferences->reservationStartTime) }}@endif"/> + value="@if( isset( $preferences) ){{date('m/d/Y A',$preferences->reservationStartTime/1000) }}@endif"/> <span class="input-group-addon"> <span class="glyphicon glyphicon-calendar"></span> </span> @@ -147,7 +147,7 @@ <div class="input-group date datetimepicker2"> <input type="text" name="reservationEndTime" class="form-control" - value="@if( isset( $preferences) ){{date('m/d/Y h:i:s A',$preferences->reservationEndTime) }}@endif"/> + value="@if( isset( $preferences) ){{date('m/d/Y A',$preferences->reservationEndTime/1000) }}@endif"/> <span class="input-group-addon"> <span class="glyphicon glyphicon-calendar"></span> </span> http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/ff0bbbdd/app/views/partials/dashboard-block.blade.php ---------------------------------------------------------------------- diff --git a/app/views/partials/dashboard-block.blade.php b/app/views/partials/dashboard-block.blade.php index 575f833..d2b5220 100644 --- a/app/views/partials/dashboard-block.blade.php +++ b/app/views/partials/dashboard-block.blade.php @@ -79,7 +79,7 @@ <li @if( Session::has("admin-nav") && Session::get("admin-nav") == "gateway-prefs") class="active" @endif> <a class="dashboard-link" href="{{ URL::to('/')}}/admin/dashboard/gateway"><span class="glyphicon glyphicon-sort"></span> - Gateway Profile</a> + Gateway Management</a> </li> <li
