Update edit event form for enable_members flag.

If the members are disabled then just output hidden field.

diff --git a/models/admin/events/index.php b/models/admin/events/index.php
index 86902b1..b8014a8 100644 (file)
--- a/models/admin/events/index.php
+++ b/models/admin/events/index.php
@@ -88,13 +88,13 @@ class GlmMembersAdmin_events_index extends GlmDataEvents
     public function modelAction($actionData = false)
     {
 
-        $memberID = false;
+        $memberID       = false;
         $lockedToMember = false;
-        $lockedWhereT = 'true';
-        $lockedWhere = 'true';
-        $numbEvents = 0;
-        $numbPending = 0;
-        $namesList = false;
+        $lockedWhereT   = 'true';
+        $lockedWhere    = 'true';
+        $numbEvents     = 0;
+        $numbPending    = 0;
+        $namesList      = false;
         $haveCategories = false;
 
         // Check if there's a logged in user who is locked to their own entity
@@ -138,18 +138,18 @@ class GlmMembersAdmin_events_index extends GlmDataEvents
         // Compile template data
         $templateData = array(
             'lockedToMember' => $lockedToMember,
-            'numbEvents' => $numbEvents,
-            'pending' => $pending,
-            'namesList' => $namesList,
-            'numbPending' => $numbPending,
+            'numbEvents'     => $numbEvents,
+            'pending'        => $pending,
+            'namesList'      => $namesList,
+            'numbPending'    => $numbPending,
             'haveCategories' => $haveCategories
         );
              // Return status, any suggested view, and any data to controller
         return array(
-                'status' => true,
-                'modelRedirect' => false,
-                'view' => 'admin/events/index.html',
-                'data' => $templateData
+            'status'        => true,
+            'modelRedirect' => false,
+            'view'          => 'admin/events/index.html',
+            'data'          => $templateData
         );
 
     }

diff --git a/models/admin/events/list.php b/models/admin/events/list.php
index d88d152..35e4ed9 100644 (file)
--- a/models/admin/events/list.php
+++ b/models/admin/events/list.php
@@ -92,53 +92,54 @@ class GlmMembersAdmin_events_list extends GlmDataEvents
     public function modelAction($actionData = false)
     {
 
-        $lockedToMember = false;
-        $numbEvents = 0;
-        $option = 'list';
-        $events = false;
-        $haveEvents = false;
-        $event = false;
-        $haveEvent = false;
-        $this->eventID = false;
-        $eventUpdated = false;
+        $lockedToMember   = false;
+        $numbEvents       = 0;
+        $option           = 'list';
+        $events           = false;
+        $haveEvents       = false;
+        $event            = false;
+        $haveEvent        = false;
+        $this->eventID    = false;
+        $eventUpdated     = false;
         $eventUpdateError = false;
-        $eventAdded = false;
-        $eventAddError = false;
-        $view = 'list';
-        $fromDate = false;
-        $toDate = false;
-        $filterArchived = false;
-        $filterPending = false;
-        $eventDeleted = false;
+        $eventAdded       = false;
+        $eventAddError    = false;
+        $view             = 'list';
+        $fromDate         = false;
+        $toDate           = false;
+        $filterArchived   = false;
+        $filterPending    = false;
+        $eventDeleted     = false;
         $eventDeleteError = false;
-        $locations = false;
-        $haveLocations = false;
-        $numbLocations = 0;
-        $recurrences = false;
-        $haveRecurrences = false;
-        $numbRecurrences = 0;
-        $times = false;
-        $haveTimes = false;
-        $firstTime = false;
-        $lastTime = false;
-        $memberID = false;
-        $haveMember = false;
-        $memberName = false;
-        $memberData = false;
-        $numbDisplayed = false;
-        $lastDisplayed = false;
-        $paging = true;
-        $prevStart = false;
-        $nextStart = false;
-        $start = 1;
-        $limit = 20;        // Set to the number of listings per page
-        $namesList = false;
+        $locations        = false;
+        $haveLocations    = false;
+        $numbLocations    = 0;
+        $recurrences      = false;
+        $haveRecurrences  = false;
+        $numbRecurrences  = 0;
+        $times            = false;
+        $haveTimes        = false;
+        $firstTime        = false;
+        $lastTime         = false;
+        $memberID         = false;
+        $haveMember       = false;
+        $memberName       = false;
+        $memberData       = false;
+        $numbDisplayed    = false;
+        $lastDisplayed    = false;
+        $paging           = true;
+        $prevStart        = false;
+        $nextStart        = false;
+        $start            = 1;
+        $limit            = 20;        // Set to the number of listings per page
+        $namesList        = false;
+        $enable_members   = $this->config['settings']['enable_members'];
 
         // Check if there's a logged in user who is locked to their own entity
         $lockedToMember = apply_filters('glm_members_locked_to_member_id', false);
         if ($lockedToMember) {
             $memberID = $lockedToMember;
-            $this->fields['admin_name']['required'] = true;
+            $this->fields['admin_name']['required']  = true;
             $this->fields['admin_email']['required'] = true;
             $this->fields['admin_phone']['required'] = true;
 
@@ -151,11 +152,11 @@ class GlmMembersAdmin_events_list extends GlmDataEvents
             // If there's no valid member ID, we can't continue
             if ($memberID == 0) {
                 return array(
-                    'status' => false,
+                    'status'           => false,
                     'menuItemRedirect' => 'error',
-                    'modelRedirect' => 'index',
-                    'view' => 'admin/error/index.html',
-                    'data' => array(
+                    'modelRedirect'    => 'index',
+                    'view'             => 'admin/error/index.html',
+                    'data'             => array(
                         'reason' => 'No member ID was provided.'
                     )
                 );
@@ -167,16 +168,16 @@ class GlmMembersAdmin_events_list extends GlmDataEvents
 
             // Get base member information
             require_once GLM_MEMBERS_PLUGIN_CLASS_PATH.'/data/dataMembers.php';
-            $Member = new GlmDataMembers($this->wpdb, $this->config);
+            $Member     = new GlmDataMembers($this->wpdb, $this->config);
             $memberData = $Member->getEntry($memberID);
 
             if (!$memberData) {
                 return array(
-                    'status' => false,
+                    'status'           => false,
                     'menuItemRedirect' => 'error',
-                    'modelRedirect' => 'index',
-                    'view' => 'admin/error/index.html',
-                    'data' => array(
+                    'modelRedirect'    => 'index',
+                    'view'             => 'admin/error/index.html',
+                    'data'             => array(
                         'reason' => 'No member data found for provided member ID.'
                     )
                 );
@@ -722,58 +723,59 @@ class GlmMembersAdmin_events_list extends GlmDataEvents
             $this->config['settings']['event_default_state'] = $this->config['settings']['default_state'];
         }
         $templateData = array(
-            'lockedToMember' => $lockedToMember,
-            'option' => $option,
-            'events' => $events,
-            'haveEvents' => $haveEvents,
-            'event' => $event,
-            'haveEvent' => $haveEvent,
-            'eventID' => $this->eventID,
-            'eventUpdated' => $eventUpdated,
-            'eventUpdateError' => $eventUpdateError,
-            'eventAdded' => $eventAdded,
-            'eventAddError' => $eventAddError,
-            'numbEvents' => $numbEvents,
-            'categories' => $categories,
-            'fromDate' => $fromDate,
-            'toDate' => $toDate,
-            'filterArchived' => $filterArchived,
-            'filterPending' => $filterPending,
-            'eventDeleted' => $eventDeleted,
-            'eventDeleteError' => $eventDeleteError,
-            'locations' => $locations,
-            'haveLocations' => $haveLocations,
-            'numbLocations' => $numbLocations,
-            'newLocation' => $newLocation,
-            'recurrences' => $recurrences,
-            'haveRecurrences' => $haveRecurrences,
-            'numbRecurrences' => $numbRecurrences,
-            'newRecurrence' => $newRecurrence,
-            'times' => $times,
-            'haveTimes' => $haveTimes,
-            'firstTime' => $firstTime,
-            'lastTime' => $lastTime,
-            'memberID' => $memberID,
-            'haveMember' => $haveMember,
-            'memberName' => $memberName,
-            'memberData' => $memberData,
-            'numbDisplayed' => $numbDisplayed,
-            'lastDisplayed' => $lastDisplayed,
-            'paging' => $paging,
-            'prevStart' => $prevStart,
-            'nextStart' => $nextStart,
-            'start' => $start = 1,
-            'limit' => $limit,
-            'namesList' => $namesList,
+            'enable_members'    => $enable_members,
+            'lockedToMember'    => $lockedToMember,
+            'option'            => $option,
+            'events'            => $events,
+            'haveEvents'        => $haveEvents,
+            'event'             => $event,
+            'haveEvent'         => $haveEvent,
+            'eventID'           => $this->eventID,
+            'eventUpdated'      => $eventUpdated,
+            'eventUpdateError'  => $eventUpdateError,
+            'eventAdded'        => $eventAdded,
+            'eventAddError'     => $eventAddError,
+            'numbEvents'        => $numbEvents,
+            'categories'        => $categories,
+            'fromDate'          => $fromDate,
+            'toDate'            => $toDate,
+            'filterArchived'    => $filterArchived,
+            'filterPending'     => $filterPending,
+            'eventDeleted'      => $eventDeleted,
+            'eventDeleteError'  => $eventDeleteError,
+            'locations'         => $locations,
+            'haveLocations'     => $haveLocations,
+            'numbLocations'     => $numbLocations,
+            'newLocation'       => $newLocation,
+            'recurrences'       => $recurrences,
+            'haveRecurrences'   => $haveRecurrences,
+            'numbRecurrences'   => $numbRecurrences,
+            'newRecurrence'     => $newRecurrence,
+            'times'             => $times,
+            'haveTimes'         => $haveTimes,
+            'firstTime'         => $firstTime,
+            'lastTime'          => $lastTime,
+            'memberID'          => $memberID,
+            'haveMember'        => $haveMember,
+            'memberName'        => $memberName,
+            'memberData'        => $memberData,
+            'numbDisplayed'     => $numbDisplayed,
+            'lastDisplayed'     => $lastDisplayed,
+            'paging'            => $paging,
+            'prevStart'         => $prevStart,
+            'nextStart'         => $nextStart,
+            'start'             => $start                                           = 1,
+            'limit'             => $limit,
+            'namesList'         => $namesList,
             'eventDefaultState' => $this->config['settings']['event_default_state']
         );
 
         // Return status, any suggested view, and any data to controller
         return array(
-                'status' => true,
-                'modelRedirect' => false,
-                'view' => "admin/events/$view.html",
-                'data' => $templateData
+            'status'        => true,
+            'modelRedirect' => false,
+            'view'          => "admin/events/$view.html",
+            'data'          => $templateData
         );
 
     }

diff --git a/views/admin/events/editStatus.html b/views/admin/events/editStatus.html
index 2cc50ff..14f7008 100644 (file)
--- a/views/admin/events/editStatus.html
+++ b/views/admin/events/editStatus.html
@@ -15,6 +15,7 @@
                 {if $event.fieldFail.name}<p>{$event.fieldFail.name}</p>{/if}<br>
             </td>
         </tr>
+    {if $enable_members}
         {if $event.fieldData.ref_dest.list|@count > 1}
             <tr>
                 <th>{$terms.term_member_cap}:</th>
@@ -34,6 +35,13 @@
         {else}
             <input type="hidden" name="ref_dest" value="0">
         {/if}
+    {else}
+        {if $event.fieldData.ref_dest.value}
+            <input type="hidden" name="ref_dest" value="{$event.fieldData.ref_dest.value}">
+        {else}
+            <input type="hidden" name="ref_dest" value="0">
+        {/if}
+    {/if}
 {if $haveEvent}
         <tr>
             <th>Name for URLs:</th>