fixing the categories reset filter issue with firing extra ajax requests

diff --git a/js/memberManagement.js b/js/memberManagement.js
index 079d139..e5155e6 100644 (file)
--- a/js/memberManagement.js
+++ b/js/memberManagement.js
@@ -74,10 +74,7 @@ window.Glma = (function() {
                     input.prop("checked", false)
                     break;
                 case "select2": 
-                       //input.val("").trigger('change');
-                       console.log(input)
-                       input.select2('val', null);
-
+                       input.val(null).trigger('change', {clear: true});
                     break;
                 case "select": 
                     input.prop('selectedIndex', 0); //Sets the first option as selected

diff --git a/views/admin/manageDashboard/index.html b/views/admin/manageDashboard/index.html
index f67cd38..68a6ed7 100644 (file)
--- a/views/admin/manageDashboard/index.html
+++ b/views/admin/manageDashboard/index.html
@@ -103,24 +103,22 @@
         );
    
         $("#glm-admin-reset-filters").on("click", function(e){
-            // e.stopPropagation();
             $("#glm-admin-search-overlay").fadeIn('fast');
-            // console.log("test");
             window.Glma.resetFilters();
-            // window.Glma.deleteFilterFields(listData);
-            // window.Glma.manageMember(
-            //     listData,
-            //     '', 
-            //     function(data) {
+            window.Glma.deleteFilterFields(listData);
+            window.Glma.manageMember(
+                listData,
+                '', 
+                function(data) {
 
-            //         $("#member-results-container").html(data.searchData);
-            //         $("#glm-admin-search-overlay").fadeOut('slow');
-            //     },
-            //     function(error) {
-            //         console.log(error);
-            //     },
-            //     "POST"
-            // );
+                    $("#member-results-container").html(data.searchData);
+                    $("#glm-admin-search-overlay").fadeOut('slow');
+                },
+                function(error) {
+                    console.log(error);
+                },
+                "POST"
+            );
         })
 
         $(".glm-search-checkbox").on("change", function(){
@@ -198,30 +196,32 @@
             M.Sidenav.getInstance($('.edit-screen')[0]).open(); 
         });
         
-        $('#filterCategories').on('change', function (e) {
-            $("#glm-admin-search-overlay").fadeIn('fast');
-            if( $(this).select2("val")){
-                listData.categorySearch = $(this).select2("val").join(",");
-            }else{
-                listData.categorySearch = "";
-            }
+        $('#filterCategories').on('change', function (e, clear) {
+            if(!clear){
+                $("#glm-admin-search-overlay").fadeIn('fast');
+                if( $(this).select2("val")){
+                    listData.categorySearch = $(this).select2("val").join(",");
+                }else{
+                    listData.categorySearch = "";
+                }
 
-            window.Glma.deleteFilterFields(listData);
-            window.Glma.updateSearchFilterValues();
-            var queries = window.Glma.getSearchFieldValues();
-            window.Glma.mergeProps(listData, queries);
-            Glma.manageMember(
-                listData,
-                '', 
-                function(data) {
-                    $("#member-results-container").html(data.searchData);
-                    $("#glm-admin-search-overlay").fadeOut('slow');
-                },
-                function(error) {
-                    console.log(error);
-                },
-                "POST"
-            );
+                window.Glma.deleteFilterFields(listData);
+                window.Glma.updateSearchFilterValues();
+                var queries = window.Glma.getSearchFieldValues();
+                window.Glma.mergeProps(listData, queries);
+                Glma.manageMember(
+                    listData,
+                    '', 
+                    function(data) {
+                        $("#member-results-container").html(data.searchData);
+                        $("#glm-admin-search-overlay").fadeOut('slow');
+                    },
+                    function(error) {
+                        console.log(error);
+                    },
+                    "POST"
+                );
+            }
         });
 
         $('#filterMemberTypes').on('change', function (e) {