Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id D7840200BB8 for ; Fri, 28 Oct 2016 22:04:50 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id D647F160AE4; Fri, 28 Oct 2016 20:04:50 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id 35140160B10 for ; Fri, 28 Oct 2016 22:04:49 +0200 (CEST) Received: (qmail 27867 invoked by uid 500); 28 Oct 2016 20:04:48 -0000 Mailing-List: contact commits-help@airavata.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@airavata.apache.org Delivered-To: mailing list commits@airavata.apache.org Received: (qmail 27348 invoked by uid 99); 28 Oct 2016 20:04:48 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 28 Oct 2016 20:04:48 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id A2AD8F1714; Fri, 28 Oct 2016 20:04:47 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: smarru@apache.org To: commits@airavata.apache.org Date: Fri, 28 Oct 2016 20:04:59 -0000 Message-Id: <69279b057b7c47b58b0b445ff347ed42@git.apache.org> In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [13/18] airavata-php-gateway git commit: AIRAVATA-2152 Fix reservation times datetimepicker archived-at: Fri, 28 Oct 2016 20:04:51 -0000 AIRAVATA-2152 Fix reservation times datetimepicker Fixes bug when value of datetimepicker is " ". Now it is either a date time string or an empty string. I couldn't get setMinDate/setMaxDate to work so I just removed it. Updated the name of datetimepicker to include version number. The version we are using comes from https://github.com/Eonasdan/bootstrap-datetimepicker/tree/v3.1.3 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/3a790190 Tree: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/tree/3a790190 Diff: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/diff/3a790190 Branch: refs/heads/develop Commit: 3a790190744b22e9fd79d7cb5afc7141b65ee236 Parents: 95e34c2 Author: Marcus Christie Authored: Thu Oct 20 11:49:23 2016 -0400 Committer: Marcus Christie Committed: Fri Oct 28 15:04:31 2016 -0400 ---------------------------------------------------------------------- app/views/account/user-compute-resources.blade.php | 12 +----------- app/views/admin/manage-experiments.blade.php | 2 +- app/views/admin/manage-gateway.blade.php | 2 +- app/views/admin/manage-notices.blade.php | 2 +- app/views/experiment/browse.blade.php | 2 +- app/views/experiment/no-sharing-browse.blade.php | 2 +- .../user-compute-resource-preferences.blade.php | 16 ++++++++++------ public/js/datetimepicker-3.1.3.js | 1 + public/js/datetimepicker.js | 1 - 9 files changed, 17 insertions(+), 23 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/3a790190/app/views/account/user-compute-resources.blade.php ---------------------------------------------------------------------- diff --git a/app/views/account/user-compute-resources.blade.php b/app/views/account/user-compute-resources.blade.php index e46f37e..4d451ba 100644 --- a/app/views/account/user-compute-resources.blade.php +++ b/app/views/account/user-compute-resources.blade.php @@ -15,7 +15,6 @@ button.add-user-cr { @stop @section('content') - @foreach( (array)$computeResources as $index => $cr) @include('partials/user-compute-resource-preferences', array('computeResource' => $cr)) @endforeach @@ -122,7 +121,7 @@ button.add-user-cr { @section('scripts') @parent {{ HTML::script('js/moment.js')}} -{{ HTML::script('js/datetimepicker.js')}} +{{ HTML::script('js/datetimepicker-3.1.3.js')}} @stop \ No newline at end of file http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/3a790190/app/views/admin/manage-experiments.blade.php ---------------------------------------------------------------------- diff --git a/app/views/admin/manage-experiments.blade.php b/app/views/admin/manage-experiments.blade.php index 8949f4a..c2fad49 100644 --- a/app/views/admin/manage-experiments.blade.php +++ b/app/views/admin/manage-experiments.blade.php @@ -312,7 +312,7 @@ @parent {{ HTML::script('js/gateway.js') }} {{ HTML::script('js/moment.js')}} -{{ HTML::script('js/datetimepicker.js')}} +{{ HTML::script('js/datetimepicker-3.1.3.js')}}