From 6927bfa3b692432bc49dfd33b93a704cc9eca47e Mon Sep 17 00:00:00 2001
From: Anthony Talarico <talarico@gaslightmedia.com>
Date: Fri, 28 Dec 2018 12:34:11 -0500
Subject: [PATCH] creating new memberManagement ajax model

---
 models/admin/ajax/adminSearch.php                          | 7 ++++---
 models/admin/ajax/{memberEdit.php => memberManagement.php} | 2 +-
 setup/validActions.php                                     | 2 +-
 views/admin/manageDashboard/index.html                     | 2 +-
 4 files changed, 7 insertions(+), 6 deletions(-)
 rename models/admin/ajax/{memberEdit.php => memberManagement.php} (96%)

diff --git a/models/admin/ajax/adminSearch.php b/models/admin/ajax/adminSearch.php
index 48adaa6c..add69882 100644
--- a/models/admin/ajax/adminSearch.php
+++ b/models/admin/ajax/adminSearch.php
@@ -12,13 +12,13 @@
  * @license  http://www.gaslightmedia.com Gaslightmedia
  * @version  0.1
  */
-
+require_once GLM_MEMBERS_PLUGIN_PATH . '/controllers/admin.php';
 /**
  *
  * This class exports the currently selected members list
  * to a printable HTML file, to a CSV file, or otherwise.
  */
-class GlmMembersAdmin_ajax_adminSearch
+class GlmMembersAdmin_ajax_adminSearch extends glmMembersAdmin
 {
 
     /**
@@ -88,7 +88,8 @@ class GlmMembersAdmin_ajax_adminSearch
         $limit = 20;
 
         $status = $this->config['status_numb']['Active'];
-        $list   = apply_filters('glm-member-db-admin-search', '');
+        // $list   = apply_filters('glm-member-db-admin-search', '');
+        $list  = $this->controller( 'manageDashboard', 'members', false, true, true);
      
         
         $return = array(
diff --git a/models/admin/ajax/memberEdit.php b/models/admin/ajax/memberManagement.php
similarity index 96%
rename from models/admin/ajax/memberEdit.php
rename to models/admin/ajax/memberManagement.php
index 0a0260c8..e2a6bcae 100644
--- a/models/admin/ajax/memberEdit.php
+++ b/models/admin/ajax/memberManagement.php
@@ -18,7 +18,7 @@ require_once GLM_MEMBERS_PLUGIN_PATH . '/controllers/admin.php';
  * This class exports the currently selected members list
  * to a printable HTML file, to a CSV file, or otherwise.
  */
-class GlmMembersAdmin_ajax_memberEdit extends glmMembersAdmin
+class GlmMembersAdmin_ajax_memberManagement extends glmMembersAdmin
 {
 
     /**
diff --git a/setup/validActions.php b/setup/validActions.php
index 8b12d5bd..760e1ff9 100644
--- a/setup/validActions.php
+++ b/setup/validActions.php
@@ -50,7 +50,7 @@ $glmMembersValidActions = array(
             'countiesMapData'     => 'glm-member-db',
             'glmTextSearch'         => 'glm-member-db',
             'adminSearch'           => 'glm-member-db',
-            'memberEdit'           => 'glm-member-db',
+            'memberManagement'      => 'glm-member-db',
         ),
         'manageDashboard' => array(
             'members' => 'glm-member-db',
diff --git a/views/admin/manageDashboard/index.html b/views/admin/manageDashboard/index.html
index f7f03fe3..5a5990c4 100644
--- a/views/admin/manageDashboard/index.html
+++ b/views/admin/manageDashboard/index.html
@@ -200,7 +200,7 @@
             $(".edit-screen").html('');
             var editData = {
                 action      : 'glm_members_admin_ajax',
-                glm_action  : 'memberEdit',
+                glm_action  : 'memberManagement',
                 form_action : 'index',
                 view        : "index",
                 option      : 'index',
-- 
2.17.1