From: Anthony Talarico Date: Wed, 27 Mar 2019 17:39:58 +0000 (-0400) Subject: fixing a bug in the checkbox filter list for custom fields. the key was getting delet... X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/?a=commitdiff_plain;h=66b5a3e4217203870b4cbdaa91f1ced487c4e76d;p=WP-Plugins%2Fglm-member-db.git fixing a bug in the checkbox filter list for custom fields. the key was getting deleted before the ajax data was being sent --- diff --git a/js/memberManagement.js b/js/memberManagement.js index a87f7f23..c128ba70 100644 --- a/js/memberManagement.js +++ b/js/memberManagement.js @@ -187,7 +187,6 @@ window.Glma = (function() { var confirmAction = function(modal){ //$('#confirmation-modal')[0] $("#glm-modal-overlay"); - console.log(modal.container) var instance = M.Modal.getInstance(modal.container); instance.open(); $(document).on("click", ".modal-close", function(){ @@ -241,7 +240,6 @@ window.Glma = (function() { * */ textSearch: function(textSearchData){ - console.log(jQuery('input#'+textSearchData.slug+'-text')); var searchResults = {}; var listData = { action : 'glm_members_admin_ajax', diff --git a/views/admin/manageDashboard/index.html b/views/admin/manageDashboard/index.html index f3c6e5a6..9c58c22a 100644 --- a/views/admin/manageDashboard/index.html +++ b/views/admin/manageDashboard/index.html @@ -247,6 +247,7 @@ member : target.attr("data-member") || null, option : target.attr('data-option') || null, view : target.attr('data-view') || null, + mergingObjects : [actionData] }); window.Glma.startTransition({ @@ -263,15 +264,26 @@ listData['categorySearch'] = ""; } } + if( type == "checkbox"){ selected = target.prop('checked'); - if(selected && type == "checkbox" ){ + if (typeof target.data("customfield") !== "undefined" && selected){ + listData[target.attr("name")] = 'true'; + var name = target.attr("name"); + + listData[name] = "true"; + }else{ + // delete listData[target.attr("name")] ; + } + + if(selected && type == "checkbox" && typeof target.data("customfield") == "undefined" ){ listData[searchType] = 'true'; {literal} target.parent().css({color: "#26A69A"}) {/literal} - }else{ + }else if(selected && type != "checkbox" && typeof target.data("customfield") == "undefined"){ delete listData[searchType]; {literal} target.parent().css({color: "#9E9E9E"}) {/literal} } + } window.Glma.manageMember( diff --git a/views/admin/member/memberInfo.html b/views/admin/member/memberInfo.html index 66c6206e..3d0431cb 100755 --- a/views/admin/member/memberInfo.html +++ b/views/admin/member/memberInfo.html @@ -5,7 +5,14 @@ - + {if apply_filters('glm_members_permit_admin_member_info_edit', true)} {if $memberInfoID && $memberInfo}