From a2a23eda650f92903fc0dc71d449075ec8fb44a3 Mon Sep 17 00:00:00 2001
From: Chuck Scott <cscott@gaslightmedia.com>
Date: Tue, 17 Jan 2017 13:10:21 -0500
Subject: [PATCH] Fixed problem with paging for a member user. Fixed problem
 with menus for Events beteen member users and members users. Updated version

---
 index.php                      |  6 ++--
 setup/adminMenus.php           | 50 ++++++++++++++++++++++------------
 views/admin/events/header.html |  2 +-
 views/admin/events/list.html   |  8 ++++--
 4 files changed, 42 insertions(+), 24 deletions(-)

diff --git a/index.php b/index.php
index 741bbd4..73169ae 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.6.5
+ * Version: 1.6.6
  * 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.6.5
+ * @version 1.6.6
  */
 
 /*
@@ -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.6.5');
+define('GLM_MEMBERS_EVENTS_PLUGIN_VERSION', '1.6.6');
 define('GLM_MEMBERS_EVENTS_PLUGIN_DB_VERSION', '0.1.1');
 
 // This is the minimum version of the GLM Members DB plugin require for this plugin.
diff --git a/setup/adminMenus.php b/setup/adminMenus.php
index 060c278..1dde0e0 100644
--- a/setup/adminMenus.php
+++ b/setup/adminMenus.php
@@ -70,25 +70,8 @@
  *
  */
 
-add_submenu_page(
-    'glm-members-admin-menu-members',                   // Parent slug
-    'Events',                                           // Page title
-    'Events',                                           // Menu Title
-    'glm_members_members',                              // Capability required
-    'glm-members-admin-menu-events-index',              // Menu slug
-    function() {$this->controller('events');}
-);
+// If this is a contact user
 
-add_submenu_page(
-    'glm-members-admin-menu-members',                    // Parent slug
-    'Events List',                                       // Page title
-    '&nbsp;&nbsp;&nbsp;&nbsp;List',                      // Menu Title
-    'glm_members_members',                               // Capability required
-    'glm-members-admin-menu-events-list',                // Menu slug
-    function() {$this->controller('events', 'list');}
-);
-
-// If a contact is logged in (ownEntity isn't false), add Contact Profile menu item
 if (isset($this->config['loggedInUser']) && isset($this->config['loggedInUser']['contactUser']) && $this->config['loggedInUser']['contactUser']) {
 
     add_submenu_page(
@@ -96,8 +79,39 @@ if (isset($this->config['loggedInUser']) && isset($this->config['loggedInUser'][
         'Events',
         'Events',
         'glm_members_edit_my_entity',
+        'glm-members-admin-menu-events-index',
+        function() {$this->controller('events');}
+    );
+
+    add_submenu_page(
+        $mainMenuSlug,
+        'Events List',
+        '&nbsp;&nbsp;&nbsp;&nbsp;List',
+        'glm_members_member',
         'glm-members-admin-menu-events-list',
+        function() {$this->controller('events', 'list');}
+    );
+
+// Otherwise it's an administrator
+} else {
+
+    add_submenu_page(
+        'glm-members-admin-menu-members',
+        'Events',
+        'Events',
+        'glm_members_members',
+        'glm-members-admin-menu-events-index',
         function() {$this->controller('events');}
     );
 
+    add_submenu_page(
+        'glm-members-admin-menu-members',
+        'Events List',
+        '&nbsp;&nbsp;&nbsp;&nbsp;List',
+        'glm_members_members',
+        'glm-members-admin-menu-events-list',
+        function() {$this->controller('events', 'list');}
+    );
+
+
 }
diff --git a/views/admin/events/header.html b/views/admin/events/header.html
index 9bf19a2..2b850b5 100644
--- a/views/admin/events/header.html
+++ b/views/admin/events/header.html
@@ -2,7 +2,7 @@
     <h2>All Events</h2>
     <h2 class="nav-tab-wrapper">
         <a href="{$thisUrl}?page={$thisPage}&glm_action=index" class="nav-tab{if $thisAction==index} nav-tab-active{/if}">Dashboard</a>
-        <a href="{$thisUrl}?page={$thisPage}&glm_action=list" class="nav-tab{if $thisAction==list} nav-tab-active{/if}">Event List</a>
+        <a href="{$thisUrl}?page=glm-members-admin-menu-events-list&aoption=list" class="nav-tab{if $thisAction==list} nav-tab-active{/if}">Event List</a>
     </h2>
     <div id="glm-admin-content-container">
     
diff --git a/views/admin/events/list.html b/views/admin/events/list.html
index 3b6b13d..b8cfb98 100644
--- a/views/admin/events/list.html
+++ b/views/admin/events/list.html
@@ -17,10 +17,14 @@
 {/if}
 
     <form action="{$thisUrl}?page={$thisPage}" method="post" id="searchForm">
-      {if $haveMember}
+    {if $haveMember}
         <input type="hidden" name="member" value="{$memberID}">
+      {if !$lockedToMember}
+        <input type="hidden" name="glm_action" value="events">
       {/if}
-        <input type="hidden" name="glm_action" value="list">
+        <input type="hidden" name="option" value="list">
+    {/if}
+      
         <input type="hidden" name="prevStart" value="{$prevStart}">
         <input type="hidden" name="nextStart" value="{$nextStart}">
         <input type="hidden" name="limit" value="{$limit}">
-- 
2.17.1