tmdinosaurcenter
/
tainacan
mirror of https://github.com/tainacan/tainacan
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Passes s instead of search param on the Search Block #428.

This commit is contained in:
mateuswetah 2020-09-10 16:30:25 -03:00
parent b1128f1229
commit d58f1b82c4
9 changed files with 15 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/classes/api/endpoints/class-tainacan-rest-items-controller.php
View File

@ -364,7 +364,6 @@ class REST_Items_Controller extends REST_Controller {
// Free php session early so simultaneous requests dont get queued
session_write_close();
$args = $this->prepare_filters($request);
/**

1
src/classes/api/endpoints/class-tainacan-rest-metadata-controller.php
View File

@ -306,7 +306,6 @@ class REST_Metadata_Controller extends REST_Controller {
public function prepare_item_for_response( $item, $request ) {
if(!empty($item)){
$item_arr = $item->_toArray();
$item_arr['metadata_type_object'] = $item->get_metadata_type_object()->_toArray();
if(isset($item_arr['metadata_type_options']) && isset($item_arr['metadata_type_options']['taxonomy_id'])){

2
src/views/admin/js/store/modules/collection/actions.js
View File

@ -38,8 +38,6 @@ export const fetchItems = ({ rootGetters, dispatch, commit }, { collectionId, is
if (postQueries.advancedSearch)
advancedSearchResults = postQueries.advancedSearch;
}
if (postQueries.s != undefined && postQueries.s != null)
postQueries.search = postQueries.s;
let query = qs.stringify(postQueries);

1
src/views/admin/js/store/modules/search/actions.js
View File

@ -9,6 +9,7 @@ export const set_postquery = ({ commit }, postquery ) => {
export const set_advanced_query = ({commit}, advancedSearchQuery) => {
commit('removePostQueryAttribute', 'search');
commit('removePostQueryAttribute', 's');
commit('setAdvancedSearchQuery', advancedSearchQuery);
};

2
src/views/admin/js/store/modules/search/getters.js
View File

@ -46,7 +46,7 @@ export const getOrderBy = state => {
};
export const getSearchQuery = state => {
return state.postquery.search;
return state.postquery.search || state.postquery.s;
};
export const getStatus = state => {

8
src/views/admin/js/store/modules/search/mutations.js
View File

@ -134,11 +134,13 @@ export const setItemsPerPage = ( state, itemsPerPage ) => {
export const setSearchQuery = ( state, searchQuery ) => {
if (searchQuery != '') {
if (searchQuery != '')
state.postquery.search = searchQuery;
} else {
else
delete state.postquery.search;
}
// In case a s parameter was passed
delete state.postquery.s;
};
export const setStatus = ( state, status ) => {

8
src/views/gutenberg-blocks/tainacan-items/search-bar/index.js
View File

@ -184,7 +184,7 @@ registerBlockType('tainacan/search-bar', {
style={{ borderColor: showCollectionHeader && collectionBackgroundColor ? collectionBackgroundColor : '' }}
id="tainacan-search-bar-block_input"
label={ __('Search', 'tainacan')}
name='search'
name='s'
placeholder={ placeholderText }
/>
<button
@ -229,7 +229,7 @@ registerBlockType('tainacan/search-bar', {
style={{ borderColor: showCollectionHeader && collectionBackgroundColor ? collectionBackgroundColor : '' }}
id="tainacan-search-bar-block_input"
label={ __('Search', 'tainacan')}
name='search'
name='s'
placeholder={ placeholderText }
/>
<button
@ -621,7 +621,7 @@ registerBlockType('tainacan/search-bar', {
style={{ borderColor: showCollectionHeader && collectionBackgroundColor ? collectionBackgroundColor : '' }}
id="tainacan-search-bar-block_input"
label={ __('Search', 'tainacan')}
name='search'
name='s'
placeholder={ placeholderText }
/>
<button
@ -667,7 +667,7 @@ registerBlockType('tainacan/search-bar', {
style={{ borderColor: showCollectionHeader && collectionBackgroundColor ? collectionBackgroundColor : '' }}
id="tainacan-search-bar-block_input"
label={ __('Search', 'tainacan')}
name='search'
name='s'
placeholder={ placeholderText }
/>
<button

2
src/views/gutenberg-blocks/tainacan-items/search-bar/search-bar-theme-script.js
View File

@ -6,7 +6,7 @@ document.addEventListener("DOMContentLoaded",() => {
let input = document.getElementById('tainacan-search-bar-block_input');
if (input) {
if (input.value)
window.location.href = e.target.action + '?search=' + input.value;
window.location.href = e.target.action + '?s=' + input.value;
return;
}
}));