fixing agenda view event date output after searching, recurrences set to true in...

diff --git a/index.php b/index.php
index 0eea4e6..d0d55e1 100644 (file)
--- 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.4.0
+ * Version: 1.4.3
  * Author: Chuck Scott
  * Author URI: http://www.gaslightmedia.com/
  * License: GPL2
@@ -20,7 +20,7 @@
  * @package glmMembersDatabaseEventsAddOn
  * @author Chuck Scott <cscott@gaslightmedia.com>
  * @license http://www.gaslightmedia.com Gaslightmedia
- * @version 1.4.0
+ * @version 1.4.3
  */
 
 /*
@@ -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.4.0');
+define('GLM_MEMBERS_EVENTS_PLUGIN_VERSION', '1.4.3');
 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/models/front/events/list.php b/models/front/events/list.php
index cdee114..b5503dd 100644 (file)
--- a/models/front/events/list.php
+++ b/models/front/events/list.php
@@ -192,7 +192,7 @@ class GlmMembersFront_events_list extends GlmMembersFront_events_baseAction
         wp_enqueue_script('event-dashboard-js');
         wp_enqueue_style('jquery-style', '//ajax.googleapis.com/ajax/libs/jqueryui/1.8.2/themes/smoothness/jquery-ui.css');
 
-
+         $this->postAddRecurrences = true;
         switch ( $action ) {
         case 'front-page':
             $events = $this->getModelEventsData($categoryId, $limit);
@@ -202,8 +202,10 @@ class GlmMembersFront_events_list extends GlmMembersFront_events_baseAction
             $view = 'agenda.html';
             break;
         case 'event-list':
+            $this->postAddRecurrences = true;
             $events = $this->getModelEventsData($categoryId);
             $view = 'agenda.html';
+            $this->postAddRecurrences = false;
             break;
         case 'nameSearch':
             // get list of names based on term

diff --git a/views/front/events/agenda.html b/views/front/events/agenda.html
index 46ff0ee..594c02b 100644 (file)
--- a/views/front/events/agenda.html
+++ b/views/front/events/agenda.html
@@ -1,4 +1,5 @@
 <div id="glm-event-wrapper">
+    test
     <div class="row">
         {include file='front/events/searchForm.html'}
     </div>
@@ -21,7 +22,8 @@
                             <div class="row glm-event-day-event">
                                 <div class="small-12 columns">
                                         <h2 class="agenda-event-name">{$event.name}</h2>
-                                        <div class='date-range-container'>( Occurring <span class="agenda-event-recur-dates">{$event.recurrences.0.from_date.date} - {$event.recurrences.0.to_date.date}</span>  
+                                        <div class='date-range-container'>( Occurring <span class="agenda-event-recur-dates">{$event.recurrences.0.from_date.date} - {$event.recurrences.0.to_date.date}</span> 
+       
                                         {if $event.recurrences.0.day_of_week.names|@count < 7 && $event.recurrences.0.day_of_week.names|@count > 0 }
                                         <span class="agenda-days-of-week">
                                             on