Update events so the use_event_amenity flag works on edit and settings.

Setting up the use_event_amenity settings to turn off and
on the event amenities in settings page and the event edit add pages.

diff --git a/models/admin/events/list.php b/models/admin/events/list.php
index d3099a3..933b5a7 100644 (file)
--- a/models/admin/events/list.php
+++ b/models/admin/events/list.php
@@ -248,8 +248,10 @@ class GlmMembersAdmin_events_list extends GlmDataEvents
                 $this->updateCategories();
                 $categories = $Categories->getListSortedParentChild(false);
 
-                $this->updateAmenities();
-                $amenities = $Amenities->getList(false);
+                if ( $this->config['settings']['use_event_amenities'] ) {
+                    $this->updateAmenities();
+                    $amenities = $Amenities->getList(false);
+                }
 
                 $event = $this->insertEntry();
 
@@ -356,17 +358,11 @@ class GlmMembersAdmin_events_list extends GlmDataEvents
 
                 $event = $this->editEntry($this->eventID);
 
-                //echo '<pre>$event: ' . print_r( $event, true ) . '</pre>';
-
                 if ($event['status']) {
                     $haveEvent = true;
                 }
 
                 $view = 'edit';
-
-                // Get any recurrence entries
-
-
                 break;
 
             case 'update':
@@ -384,8 +380,10 @@ class GlmMembersAdmin_events_list extends GlmDataEvents
                 $this->updateCategories();
                 $categories = $Categories->getListSortedParentChild(false);
 
-                $this->updateAmenities();
-                $amenities = $Amenities->getList(false);
+                if ( $this->config['settings']['use_event_amenities'] ) {
+                    $this->updateAmenities();
+                    $amenities = $Amenities->getList(false);
+                }
 
                 // Try to update this event
                 $event = $this->updateEntry($this->eventID);

diff --git a/setup/adminTabs.php b/setup/adminTabs.php
index 461e29b..72639e8 100644 (file)
--- a/setup/adminTabs.php
+++ b/setup/adminTabs.php
@@ -69,16 +69,17 @@ if (current_user_can('glm_members_members')) {
 
     add_filter('glm-member-db-add-tab-for-settings',
         function($addOnTabs) {
-            //echo '<pre>$config: ' . print_r( $GLOBALS['config'], true ) . '</pre>';
-            $newTabs = array(
-                array(
-                    'text' => 'Event ' . $GLOBALS['config']['settings']['term_event_amenities_plural'],
-                    'menu' => 'settings',
-                    'action' => 'eventAmenities'
-                ),
+            if ( $GLOBALS['config']['settings']['use_event_amenities']) {
+                $newTabs = array(
+                    array(
+                        'text' => 'Event ' . $GLOBALS['config']['settings']['term_event_amenities_plural'],
+                        'menu' => 'settings',
+                        'action' => 'eventAmenities'
+                    ),
 
-            );
-            $addOnTabs = array_merge($addOnTabs, $newTabs);
+                );
+                $addOnTabs = array_merge($addOnTabs, $newTabs);
+            }
             return $addOnTabs;
         }
     );

diff --git a/views/admin/events/editStatus.html b/views/admin/events/editStatus.html
index 26257cb..470cee7 100644 (file)
--- a/views/admin/events/editStatus.html
+++ b/views/admin/events/editStatus.html
@@ -154,6 +154,7 @@
                 </div>
             </td>
         </tr>
+        {if $settings.use_event_amenities}
         <tr>
             <th>{$settings.term_event_amenities_plural}</th>
             <td class="glm-item-container">
@@ -217,6 +218,7 @@
                 </div>
             </td>
         </tr>
+        {/if}
         <tr>
             <th {if $event.fieldRequired.intro}class="glm-required"{/if}>Intro Text:</th>
             <td {if $event.fieldFail.intro}class="glm-form-bad-input" data-tabid="glm-event-descr"{/if}>