From: Anthony Talarico <talarico@gaslightmedia.com>
Date: Thu, 25 Aug 2016 20:39:09 +0000 (-0400)
Subject: adding hidden field in the event search form so that the agenda calendar view can... 
X-Git-Tag: v1.3.3^2~34
X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/?a=commitdiff_plain;h=34673a36dd3ac94d0c3a32cb73ebfe22314a282c;p=WP-Plugins%2Fglm-member-db-events.git

adding hidden field in the event search form so that the agenda calendar view can be overriden by the search. This is because the view variable is stateless in js and needs to be php
---

diff --git a/models/front/events/list.php b/models/front/events/list.php
index dc4179b..3ad268c 100644
--- a/models/front/events/list.php
+++ b/models/front/events/list.php
@@ -610,16 +610,23 @@ class GlmMembersFront_events_list extends GlmMembersFront_events_baseAction
         if ( $event_page_id ) {
             $mainEventPageUrl = get_permalink( $event_page_id );
         }
+
         
         global $wpdb;
         $sql = "SELECT calendar_view FROM " . GLM_MEMBERS_EVENTS_PLUGIN_DB_PREFIX . "management";
         $calendar_view = $wpdb->get_results($sql, ARRAY_A);
-        if($calendar_view[0]['calendar_view'] === "none" || empty($calendar_view[0]['calendar_view'])){
+        
+        // check if event search was performed and if it is override the view to agenda
+        $override_default_view = $_REQUEST['override_default'];
+        
+        if ( $override_default_view === 'yes' ){
+            $calendar_view = "agenda";
+        }else if  ( $calendar_view[0]['calendar_view'] === "none" || empty($calendar_view[0]['calendar_view'] ) ){
                $calendar_view = "calendar";
         } else {
             $calendar_view = $calendar_view[0]['calendar_view'];
         }
-        
+
         print_r($calDates);
         // Compile template data
         $templateData = array(
diff --git a/views/front/events/agenda.html b/views/front/events/agenda.html
index 960ee64..58aeefe 100644
--- a/views/front/events/agenda.html
+++ b/views/front/events/agenda.html
@@ -68,8 +68,9 @@
         var event_search = $(".glm-search-icon");
         var main_content = $("#main-content");
         var view = '{$cal_view}';
-        
+
         if(view === "calendar"){
+            main_content.removeClass("small-8").addClass("small-12");
             calendar.show();
             rows.hide();
             view_select.val('calendar');
diff --git a/views/front/events/searchForm.html b/views/front/events/searchForm.html
index 9595679..e04addc 100644
--- a/views/front/events/searchForm.html
+++ b/views/front/events/searchForm.html
@@ -23,6 +23,7 @@
         </form>
         <form id="glm-member-event-search" action="{$currentUrl}" method="post">
             <input type="hidden" name="search" value="1">
+             <input type="hidden" name="override_default" value="yes">
             <div class="row">
                 <div class="small-6 medium-3 column">
                     <div class="row collapse prefix-radius">