From aea6a1194a6769a4faa6d79b2c4e571c75bc99e2 Mon Sep 17 00:00:00 2001
From: Anthony Talarico <talarico@gaslightmedia.com>
Date: Mon, 16 Jan 2017 14:47:57 -0500
Subject: [PATCH] adding fix for override options in the events calendar agenda
 view. this will bring the user back to agenda view instead of calendar if
 they perform an event search

---
 models/front/events/list.php   | 5 +++--
 views/front/events/agenda.html | 4 +++-
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/models/front/events/list.php b/models/front/events/list.php
index b5200d3..98845b4 100644
--- a/models/front/events/list.php
+++ b/models/front/events/list.php
@@ -697,7 +697,7 @@ class GlmMembersFront_events_list extends GlmMembersFront_events_baseAction
         $calendar_view = $wpdb->get_results($sql, ARRAY_A);
 
         // check if event search was performed and if it is override the view to agenda
-        $override_default_view = ( isset( $_REQUEST['override_default'] ) ) ? $_REQUEST['override_default'] : '';
+        $override_default_view = ( isset( $_REQUEST['override_default'] ) ) ? $_REQUEST['override_default'] : 'no';
 
         if ( $override_default_view === 'yes' ) {
             $calendar_view = "agenda";
@@ -731,7 +731,8 @@ class GlmMembersFront_events_list extends GlmMembersFront_events_baseAction
             'mainImgUrl'   => GLM_MEMBERS_PLUGIN_MEDIA_URL . '/images/large/',
             'imgUrl'       => GLM_MEMBERS_PLUGIN_MEDIA_URL . '/images/small/',
             'calDates'     => $calDates,
-            'cal_view'     => $calendar_view
+            'cal_view'     => $calendar_view,
+            'override'     => $override_default_view
         );
         error_reporting(E_ALL ^ E_NOTICE);
         return array(
diff --git a/views/front/events/agenda.html b/views/front/events/agenda.html
index 444f671..f15a138 100644
--- a/views/front/events/agenda.html
+++ b/views/front/events/agenda.html
@@ -102,10 +102,12 @@
         var event_search        = $(".glm-search-icon");
         var main_content        = $("#main-content");
         var view                = '{$cal_view}';
+        var override            = '{$override}';
 
-        if( sessionStorage.view ){
+        if( sessionStorage.view && override === 'no' ){
             view = sessionStorage.view;
         }
+
         // AJAX FUNCTION ************************************************
         // Get calendar month via AJAX
         function eventsCalMonthAJAX(month) {
-- 
2.17.1