From: Steve Sutton Date: Fri, 30 Sep 2016 20:19:31 +0000 (-0400) Subject: Fix for date range searches. X-Git-Tag: v1.3.11^2 X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/?a=commitdiff_plain;h=refs%2Fheads%2Fhotfix%2F1.3.11;p=WP-Plugins%2Fglm-member-db-events.git Fix for date range searches. Bug fix #0000030 Date from the date picker were not in default format for some reason. Setting specific date format for the jquery date picker calls. --- diff --git a/index.php b/index.php index 37dc1fd..3ca5b2e 100644 --- a/index.php +++ b/index.php @@ -3,7 +3,7 @@ * Plugin Name: GLM Members Database Events * Plugin URI: http://www.gaslightmedia.com/ * Description: Gaslight Media Members Database. - * Version: 1.3.10 + * Version: 1.3.11 * Author: Chuck Scott * Author URI: http://www.gaslightmedia.com/ * License: GPL2 @@ -20,7 +20,7 @@ * @package glmMembersDatabaseEventsAddOn * @author Chuck Scott * @license http://www.gaslightmedia.com Gaslightmedia - * @version 1.3.10 + * @version 1.3.11 */ /* @@ -38,7 +38,7 @@ * so that we're sure the other add-ons see an up to date * version from this plugin. */ -define('GLM_MEMBERS_EVENTS_PLUGIN_VERSION', '1.3.10'); +define('GLM_MEMBERS_EVENTS_PLUGIN_VERSION', '1.3.11'); define('GLM_MEMBERS_EVENTS_PLUGIN_DB_VERSION', '0.0.22'); // This is the minimum version of the GLM Members DB plugin require for this plugin. diff --git a/js/dashboard.js b/js/dashboard.js index 350a495..7ab5015 100644 --- a/js/dashboard.js +++ b/js/dashboard.js @@ -1,7 +1,11 @@ (function(){ if ($('#glm-event-from').length > 0) { - $('#glm-event-from').datepicker(); - $('#glm-event-to').datepicker(); + $('#glm-event-from').datepicker({ + dateFormat: "mm/dd/yy" + }); + $('#glm-event-to').datepicker({ + dateFormat: "mm/dd/yy" + }); } $('#glm-event-detail-backtosearch').click(function(){ window.history.back(); diff --git a/models/front/events/list.php b/models/front/events/list.php index 5cc185f..aee5dda 100644 --- a/models/front/events/list.php +++ b/models/front/events/list.php @@ -450,7 +450,6 @@ class GlmMembersFront_events_list extends GlmMembersFront_events_baseAction $pdfY -= self::LINE_HEIGHT; } $intro->draw($page->getCanvas(), self::PDF_LFT_COL_X, $pdfY); - //echo '
lineCount: ' . print_r($lineCount, true)  . '
'; $pdfY -= self::LINE_HEIGHT;// * $lineCount; $page->getCanvas()->draw()->line(self::PDF_LFT_COL_X, $pdfY, self::PDF_WIDTH, $pdfY); @@ -495,8 +494,8 @@ class GlmMembersFront_events_list extends GlmMembersFront_events_baseAction } catch(SetaPDF_Exception $e) { echo '

SetaPDF_Exception: ' . $e->getMessage() . '

'; } catch(Exception $e) { - echo '

Exception: ' . $e->getMessage() . '

'; - echo '
' . print_r( $e, true ) . '
'; + //echo '

Exception: ' . $e->getMessage() . '

'; + //echo '
' . print_r( $e, true ) . '
'; } exit; break; @@ -627,7 +626,6 @@ class GlmMembersFront_events_list extends GlmMembersFront_events_baseAction $calendar_view = $calendar_view[0]['calendar_view']; } - print_r($calDates); // Compile template data $templateData = array( 'assetsUrl' => GLM_MEMBERS_EVENTS_PLUGIN_URL . 'assets/',