From: Anthony Talarico Date: Mon, 1 Oct 2018 19:15:21 +0000 (-0400) Subject: fixing text search url being passed to the textsearch dashboard widget X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/?a=commitdiff_plain;h=00f19a6e3d835f9c07be0013dc4959ddb7e2dc99;p=WP-Plugins%2Fglm-member-db.git fixing text search url being passed to the textsearch dashboard widget --- diff --git a/setup/adminHooks.php b/setup/adminHooks.php index ddd5fde4..59410298 100644 --- a/setup/adminHooks.php +++ b/setup/adminHooks.php @@ -480,7 +480,7 @@ add_filter( 'table' => $membersTextTable, 'fields' => "id, name", 'where' => 'name', - 'resultUrl' => $memberIndexPage . "&option=edit", + 'resultUrl' => $memberIndexPage . "&glm_action=index&member=", ], [ 'id' => 'pending', diff --git a/views/admin/newDashboard/components/dateSearch.html b/views/admin/newDashboard/components/dateSearch.html index 9be4f117..13b193a8 100644 --- a/views/admin/newDashboard/components/dateSearch.html +++ b/views/admin/newDashboard/components/dateSearch.html @@ -11,9 +11,9 @@ \ No newline at end of file + }) + \ No newline at end of file diff --git a/views/admin/newDashboard/components/textSearch.html b/views/admin/newDashboard/components/textSearch.html index aa54511a..12b57d8b 100644 --- a/views/admin/newDashboard/components/textSearch.html +++ b/views/admin/newDashboard/components/textSearch.html @@ -11,7 +11,8 @@ table : '{$component.table}', fields : '{$component.fields}', where : '{$component.where}', - searchUrl : '{$component.resultUrl}' + resultUrl : '{$component.resultUrl}', + slug : '{$addon.slug}' }) }) \ No newline at end of file diff --git a/views/admin/newDashboard/index.html b/views/admin/newDashboard/index.html index 1b7544bc..7092863c 100644 --- a/views/admin/newDashboard/index.html +++ b/views/admin/newDashboard/index.html @@ -33,7 +33,7 @@ fields : textSearchData.fields, where : textSearchData.where } - $('input#{$addon.slug}-text').autoComplete({ + $('input#'+textSearchData.slug+'-text').autoComplete({ source: function( request, response ) { data.query = request; $.ajax({ @@ -49,7 +49,7 @@ let searchTitle = Object.keys(data.searchData[i])[0]; let image = (data.searchData[i][searchTitle].image) ? data.searchData[i][searchTitle].image : null; let memberID = data.searchData[i][searchTitle].memberID; - let entityID = data.searchData[i][searchTitle].entityID; + let entityID = data.searchData[i][searchTitle].entityID; searchDropdown.push(searchTitle); {literal} searchResults[searchTitle] = {image: image, memberID: memberID, entityID: entityID}; {/literal} } @@ -70,7 +70,7 @@ let search = $(item).text(); console.log(search) if(search !== "No Results Found"){ - // window.location.replace('{ $component.resultUrl}&{ $component.entityID}='+searchResults[search].entityID); + window.location.replace(textSearchData.resultUrl+searchResults[search].entityID); } }, minLength: 1,