From 86e414663c1c165f20e5dbbdbfb8a80f6d686c5c Mon Sep 17 00:00:00 2001 From: Steve Sutton Date: Fri, 21 Oct 2016 10:23:33 -0400 Subject: [PATCH] Update to get enable_member flag. This is for turning off members in the glmAssociate plugins. --- models/admin/settings/eventCategories.php | 28 ++++++++++++----------- 1 file changed, 15 insertions(+), 13 deletions(-) diff --git a/models/admin/settings/eventCategories.php b/models/admin/settings/eventCategories.php index 75714c8..5397fec 100644 --- a/models/admin/settings/eventCategories.php +++ b/models/admin/settings/eventCategories.php @@ -98,10 +98,11 @@ class GlmMembersAdmin_settings_eventCategories extends GlmDataEventsCategories public function modelAction ($actionData = false) { - $success = true; + $success = true; $haveCategories = false; - $categories = false; - $error = false; + $categories = false; + $error = false; + $enable_members = $this->config['settings']['enable_members']; // Check if a category ID is supplied $id = 0; @@ -165,11 +166,11 @@ class GlmMembersAdmin_settings_eventCategories extends GlmDataEventsCategories // If we had a fatal error, redirect to the error page if ($error) { return array( - 'status' => $success, - 'menuItemRedirect' => 'error', - 'modelRedirect' => 'index', - 'view' => 'admin/error/index.html', - 'data' => false + 'status' => $success, + 'menuItemRedirect' => 'error', + 'modelRedirect' => 'index', + 'view' => 'admin/error/index.html', + 'data' => false ); } @@ -182,17 +183,18 @@ class GlmMembersAdmin_settings_eventCategories extends GlmDataEventsCategories // Compile template data $templateData = array( + 'enable_members' => $enable_members, 'haveCategories' => $haveCategories, - 'categories' => $categories + 'categories' => $categories ); // Return status, suggested view, and data to controller return array( - 'status' => $success, + 'status' => $success, 'menuItemRedirect' => false, - 'modelRedirect' => false, - 'view' => 'admin/settings/eventCategories.html', - 'data' => $templateData + 'modelRedirect' => false, + 'view' => 'admin/settings/eventCategories.html', + 'data' => $templateData ); } -- 2.17.1