testing the reset filters functionality

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

diff --git a/views/admin/manageDashboard/index.html b/views/admin/manageDashboard/index.html
index b808df7..f67cd38 100644 (file)
--- a/views/admin/manageDashboard/index.html
+++ b/views/admin/manageDashboard/index.html
@@ -102,23 +102,25 @@
             "POST"
         );
    
-        $(document).on("click", "#glm-admin-reset-filters", function(){
+        $("#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(){
@@ -173,6 +175,7 @@
         $(document).on("click",".member-record-name",function(){
             $("#glm-admin-profile-overlay").fadeIn('fast');
             $(this).parent().addClass("glm-admin-active-record");
+            $(this).parent().siblings().removeClass("glm-admin-active-record");
             localStorage.setItem("active-record", $(this).parent().data("id"));
             $(".edit-screen-mount").html('');
             var editData = {};