From: Anthony Talarico <talarico@gaslightmedia.com>
Date: Fri, 26 Aug 2016 14:27:17 +0000 (-0400)
Subject: setting default calendar view in management to agenda, removed the select view option
X-Git-Tag: v1.3.3^2~30
X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/?a=commitdiff_plain;h=f346ab279d15b22b11c2177b25db7eb9221c095c;p=WP-Plugins%2Fglm-member-db-events.git

setting default calendar view in management to agenda, removed the select view option
---

diff --git a/models/front/events/list.php b/models/front/events/list.php
index 3ad268c..cc532a5 100644
--- a/models/front/events/list.php
+++ b/models/front/events/list.php
@@ -621,8 +621,8 @@ class GlmMembersFront_events_list extends GlmMembersFront_events_baseAction
         
         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 if  ( $calendar_view[0]['calendar_view'] === "" || empty($calendar_view[0]['calendar_view'] ) ){
+               $calendar_view = "agenda";
         } else {
             $calendar_view = $calendar_view[0]['calendar_view'];
         }
diff --git a/views/admin/management/events.html b/views/admin/management/events.html
index 3329f68..abeca99 100644
--- a/views/admin/management/events.html
+++ b/views/admin/management/events.html
@@ -57,7 +57,6 @@
                         
                             <td>
                                 <select id="calendar-view" name="calendar_view">
-                                    <option value="none"> Select View </option>
                                     <option value="agenda"> Agenda </option>
                                     <option value="calendar"> Calendar</option>
                                 </select>
@@ -297,9 +296,10 @@
                 }
 
             });
-
+            
             // Flash certain elements for a short time after display
             $(".glm-flash-updated").fadeOut(500).fadeIn(500).fadeOut(500).fadeIn(500).fadeOut(500).fadeIn(500).fadeOut(500).fadeIn(500).fadeOut(500).fadeIn(500).fadeOut(500);
-
+            
+            var view_select = $("#calendar-view").val('{$eventsSettings.fieldData.calendar_view}');
         });
     </script>