merging adminsearch and membermanagement ajax models

diff --git a/models/admin/ajax/memberManagement.php b/models/admin/ajax/memberManagement.php
index e2a6bca..dbccd59 100644 (file)
--- a/models/admin/ajax/memberManagement.php
+++ b/models/admin/ajax/memberManagement.php
@@ -73,12 +73,25 @@ class GlmMembersAdmin_ajax_memberManagement extends glmMembersAdmin
     public function modelAction ($actionData = false)
     {
         global $wpdb;
-        $memberID = $_REQUEST['memberID'];
-        $editData = $this->controller( 'member', 'index', array("memberID" => $memberID), true, true);
+        if( $_REQUEST['option'] == 'manage'){
+            $memberID = $_REQUEST['memberID'];
+            $data = $this->controller( 'member', 'index', array("memberID" => $memberID), true, true);
+        }
+        if($_REQUEST['option'] == 'list'){
+            $where              = ' true ';
+            $alphaWhere         = ' true ';
+            $start = 1;
+            $limit = 20;
+    
+            $status = $this->config['status_numb']['Active'];
+            // $list   = apply_filters('glm-member-db-admin-search', '');
+            $data  = $this->controller( 'manageDashboard', 'members', false, true, true);
+        }
+        
 
         $return = array(
             "test"          => $sql,
-            'searchData'    => $editData       // Where our events list will go
+            'searchData'    => $data       // Where our events list will go
         );
 
         header('Content-type:application/json;charset=utf-8', true);

diff --git a/views/admin/manageDashboard/index.html b/views/admin/manageDashboard/index.html
index 5a5990c..015f050 100644 (file)
--- a/views/admin/manageDashboard/index.html
+++ b/views/admin/manageDashboard/index.html
@@ -180,12 +180,10 @@
                 
         let listData = {
             action      : 'glm_members_admin_ajax',
-            glm_action  : 'adminSearch',
+            glm_action  : 'memberManagement',
             form_action : 'list',
-            view: "list"
-            // table       : textSearchData.table,
-            // fields      : textSearchData.fields,
-            // where       : textSearchData.where
+            view        : "list",
+            option      : "list" 
         }
         Glma.adminSearch(listData);
    
@@ -201,9 +199,7 @@
             var editData = {
                 action      : 'glm_members_admin_ajax',
                 glm_action  : 'memberManagement',
-                form_action : 'index',
-                view        : "index",
-                option      : 'index',
+                option      : 'manage',
                 memberID    : $(this).parent().data('id')
             }