separating standard filters reset and all filters reset , which includes pending...

diff --git a/js/memberManagement.js b/js/memberManagement.js
index 686a6d7..6779d1f 100644 (file)
--- a/js/memberManagement.js
+++ b/js/memberManagement.js
@@ -56,7 +56,7 @@ window.Glma = (function() {
         }
     }
 
-    var deleteFilterFields = function(obj){
+    var deleteStandardFilterFields = function(obj){
         var searchFields = $(".glm-admin-search-field");
         for(var i = 0; i < searchFields.length; i++){
             var field = $(searchFields[i]).attr("data-search") ;
@@ -64,6 +64,16 @@ window.Glma = (function() {
         }
     }
 
+    var deleteAllFilterFields = function(obj){
+        deleteStandardFilterFields(obj);
+        if(obj.hasOwnProperty('filterPending')){
+            delete obj.filterPending;
+        }
+        if(obj.hasOwnProperty('filterBadLocation')){
+            delete obj.filterBadLocation;
+        }
+    }
+
     var resetStandardFilters = function(){
         var searchFields = $(".glm-admin-search-field");
         for(var i = 0; i < searchFields.length; i++){
@@ -89,7 +99,8 @@ window.Glma = (function() {
     }
     var resetAllFilters = function(){
         resetStandardFilters();
-        
+        $("#quickSearchForm-pending").prop("checked", false).parent().css({color: "#9E9E9E"})
+        $("#bad-map-location").prop("checked", false).parent().css({color: "#9E9E9E"});
     }
     var updateSearchFilterValues = function(){
         var queries = {};
@@ -145,9 +156,11 @@ window.Glma = (function() {
         updateSearchFilterValues    : updateSearchFilterValues,
         getSearchFieldValues        : getSearchFieldValues,
         getSearchFieldValues        : getSearchFieldValues,
-        deleteFilterFields          : deleteFilterFields,
+        deleteAllFilterFields       : deleteAllFilterFields,
+        deleteStandardFilterFields  : deleteStandardFilterFields,
         mergeProps                  : mergeProps,
         resetStandardFilters        : resetStandardFilters,
+        resetAllFilters             : resetAllFilters,
         /*
         * call this function with a data object to configure the logic
         * # glmAction
@@ -173,7 +186,7 @@ window.Glma = (function() {
                     }else{
                         listData.query = request;
                     }
-                    deleteFilterFields(listData);
+                    deleteAllFilterFields(listData);
                     updateSearchFilterValues();
                     var queries = getSearchFieldValues();
                     mergeProps(listData, queries);

diff --git a/models/admin/manageDashboard/members.php b/models/admin/manageDashboard/members.php
index 2bb75e1..d44a7fa 100644 (file)
--- a/models/admin/manageDashboard/members.php
+++ b/models/admin/manageDashboard/members.php
@@ -427,7 +427,7 @@ class GlmMembersAdmin_manageDashboard_members extends GlmDataMembers
                 $memberProfiles[$profile['member']] = $profile;
             }
         }
-
+        
         // Add a url for each member
         if ( isset( $list) && is_array( $list ) ) {
             foreach ($list as $member) {

diff --git a/views/admin/manageDashboard/index.html b/views/admin/manageDashboard/index.html
index 958b9c4..329b53c 100644 (file)
--- a/views/admin/manageDashboard/index.html
+++ b/views/admin/manageDashboard/index.html
@@ -105,7 +105,8 @@
         $("#glm-admin-reset-filters").on("click", function(e){
             $("#glm-admin-search-overlay").fadeIn('fast');
             window.Glma.resetAllFilters();
-            window.Glma.deleteFilterFields(listData);
+            window.Glma.deleteAllFilterFields(listData);
+            console.log(listData);
             window.Glma.manageMember(
                 listData,
                 '', 
@@ -127,7 +128,7 @@
             filterData.filterArchived = $("input[name='archivedSearch']:checked").length > 0 ? true : undefined;
             filterData.filterFeatured = $("input[name='featuredSearch']:checked").length > 0 ? true : undefined;
 
-            window.Glma.deleteFilterFields(listData);
+            window.Glma.deleteAllFilterFields(listData);
             window.Glma.updateSearchFilterValues();
             var queries = window.Glma.getSearchFieldValues();
             window.Glma.mergeProps(listData, filterData);
@@ -205,7 +206,7 @@
                     listData.categorySearch = "";
                 }
 
-                window.Glma.deleteFilterFields(listData);
+                window.Glma.deleteAllFilterFields(listData);
                 window.Glma.updateSearchFilterValues();
                 var queries = window.Glma.getSearchFieldValues();
                 window.Glma.mergeProps(listData, queries);
@@ -520,7 +521,8 @@
                 "POST",
             );
         });
-        $(document).on("change", "#quickSearchForm-pending", function(){
+        $(document).on("change", "#quickSearchForm-pending", function(e){
+            console.log()
             var selected = $(this).prop('checked');
             $("#glm-admin-search-overlay").fadeIn('fast');
             // window.Glma.resetAllFilters();