From: Laury GvR <laury@gaslightmedia.com>
Date: Fri, 28 Dec 2018 20:59:32 +0000 (-0500)
Subject: Filter by pending checkbox filters results of member search by pending
X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/?a=commitdiff_plain;h=b602ee2455ea01c70500032c0453208eeec98c19;p=WP-Plugins%2Fglm-member-db.git

Filter by pending checkbox filters results of member search by pending
---

diff --git a/models/admin/ajax/memberManagement.php b/models/admin/ajax/memberManagement.php
index 03174614..66516e09 100644
--- a/models/admin/ajax/memberManagement.php
+++ b/models/admin/ajax/memberManagement.php
@@ -73,6 +73,7 @@ class GlmMembersAdmin_ajax_memberManagement extends glmMembersAdmin
     public function modelAction ($actionData = false)
     {
         global $wpdb;
+        
         foreach ($this->config['addOns'] as $a) {
             if (is_file(GLM_MEMBERS_WORDPRESS_PLUGIN_PATH.$a['slug'].'/setup/adminMenus.php')) {
                 require_once GLM_MEMBERS_WORDPRESS_PLUGIN_PATH.$a['slug'].'/setup/adminMenus.php';
@@ -97,10 +98,9 @@ class GlmMembersAdmin_ajax_memberManagement extends glmMembersAdmin
             $data  = $this->controller( 'manageDashboard', 'members', false, true, true);
         }
         
-
         $return = array(
             "test"          => $sql,
-            'searchData'    => $data       // 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 015f0508..aa6be1dd 100644
--- a/views/admin/manageDashboard/index.html
+++ b/views/admin/manageDashboard/index.html
@@ -37,7 +37,7 @@
                         data,
                         $("#glm-admin-search-overlay").fadeOut('slow'), 
                         function(data) {
-                            $("#glm-admin-member-list").append(data.searchData);
+                            $("#glm-admin-member-list").html(data.searchData);
                         },
                         "POST",
                         function(error) {
@@ -179,15 +179,23 @@
         }
                 
         let listData = {
-            action      : 'glm_members_admin_ajax',
-            glm_action  : 'memberManagement',
-            form_action : 'list',
-            view        : "list",
-            option      : "list" 
+            action          : 'glm_members_admin_ajax',
+            glm_action      : 'memberManagement',
+            form_action     : 'list',
+            view            : "list",
+            option          : "list",
         }
+
+        
         Glma.adminSearch(listData);
    
         $(".glm-admin-search-field").on("change", function(){
+            if (($("input[name='pendingSearch']:checked").length > 0)) {
+                listData.filterPending = true;
+            } else {
+                delete listData.filterPending;
+            }
+
             Glma.adminSearch(listData);
         });
         $('.edit-screen').sidenav({