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

New exhibition comportament of advanced search form and fixes error in bulk edit

This commit is contained in:
weryques 2018-07-02 16:01:09 -03:00
parent 24d4106b37
commit dc6592e795
3 changed files with 53 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/admin/components/advanced-search/advanced-search.vue
View File

@ -3,6 +3,7 @@
<div class="columns is-multiline tnc-advanced-search-container"> <div class="columns is-multiline tnc-advanced-search-container">
<div <div
v-show="!advancedSearchResults"
v-for="searchCriteria in searchCriterias" v-for="searchCriteria in searchCriterias"
:key="searchCriteria" :key="searchCriteria"
class="field column is-12 tainacan-form"> class="field column is-12 tainacan-form">
@ -92,6 +93,7 @@
<!-- Add button --> <!-- Add button -->
<div <div
v-show="!advancedSearchResults"
:style="{'padding-left': '25px !important'}" :style="{'padding-left': '25px !important'}"
class="field column is-12"> class="field column is-12">
<a <a
@ -105,8 +107,9 @@
</div> </div>
<!-- Tags --> <!-- Tags -->
<div <div
class="field column is-12"> v-show="advancedSearchResults"
class="field column is-12">
<b-field <b-field
grouped grouped
group-multiline> group-multiline>
@ -114,8 +117,8 @@
v-for="searchCriteria in searchCriterias" v-for="searchCriteria in searchCriterias"
:key="searchCriteria" :key="searchCriteria"
class="control taginput-container"> class="control taginput-container">
<b-tag <b-tag
v-if="(advancedSearchQuery.taxquery[searchCriteria] && advancedSearchQuery.taxquery[searchCriteria].terms)" v-if="advancedSearchQuery.taxquery[searchCriteria] && advancedSearchQuery.taxquery[searchCriteria].terms"
type="is-white" type="is-white"
class="is-rounded" class="is-rounded"
@close="removeThis(searchCriteria)" @close="removeThis(searchCriteria)"
@ -126,7 +129,7 @@
advancedSearchQuery.taxquery[searchCriteria].btags }} advancedSearchQuery.taxquery[searchCriteria].btags }}
</b-tag> </b-tag>
<b-tag <b-tag
v-else-if="(advancedSearchQuery.metaquery[searchCriteria] && advancedSearchQuery.metaquery[searchCriteria].value)" v-else-if="advancedSearchQuery.metaquery[searchCriteria] && advancedSearchQuery.metaquery[searchCriteria].value"
type="is-white" type="is-white"
class="is-rounded" class="is-rounded"
@close="removeThis(searchCriteria)" @close="removeThis(searchCriteria)"
@ -140,7 +143,9 @@
</div> </div>
<!-- Clear and search button --> <!-- Clear and search button -->
<div class="column"> <div
v-show="!advancedSearchResults"
class="column">
<div class="field is-grouped is-pulled-right"> <div class="field is-grouped is-pulled-right">
<p class="control"> <p class="control">
<button <button
@ -170,6 +175,14 @@
props: { props: {
metadata: Array, metadata: Array,
isRepositoryLevel: false, isRepositoryLevel: false,
advancedSearchResults: false,
openFormAdvancedSearch: false,
isDoSearch: false,
},
watch: {
isDoSearch(){
this.searchAdvanced();
}
}, },
created(){ created(){
let locale = navigator.language; let locale = navigator.language;

55
src/admin/pages/lists/items-page.vue
View File

@ -307,36 +307,45 @@
<!-- ADVANCED SEARCH --> <!-- ADVANCED SEARCH -->
<div <div
v-if="openAdvancedSearch"> v-if="openAdvancedSearch">
<b-collapse <div class="columns tnc-advanced-search-close">
class="show"
:open="advancedSearchResults ? false : true"> <div class="column">
<div <div
slot="trigger" class="field is-grouped is-pulled-right">
slot-scope="props" <p
class="columns tnc-advanced-search-close"> v-if="advancedSearchResults"
<div class="column"> class="control">
<button
@click="advancedSearchResults = !advancedSearchResults"
class="button is-small is-light">Edit search</button>
</p>
<p
v-if="advancedSearchResults"
class="control">
<button
@click="isDoSearch = !isDoSearch"
class="button is-small is-secondary">Search</button>
</p>
<p class="control">
<button <button
@click="openAdvancedSearch = false" @click="openAdvancedSearch = false"
class="button is-white is-pulled-right"> class="button is-white">
<b-icon <b-icon
size="is-small" size="is-small"
icon="close"/> icon="close"/>
</button> </button>
<button </p>
class="button is-white is-pulled-right">
<span>
{{ props.open ? $i18n.get('hide_advanced_search') : $i18n.get('show_advanced_search') }}
</span>
<b-icon
:style="'margin-left'"
:icon="props.open ? 'menu-down' : 'menu-up'" />
</button>
</div>
</div> </div>
<advanced-search
:is-repository-level="isRepositoryLevel" </div>
:metadata="metadata" />
</b-collapse> </div>
<advanced-search
:is-repository-level="isRepositoryLevel"
:advanced-search-results="advancedSearchResults"
:open-form-advanced-search="openFormAdvancedSearch"
:is-do-search="isDoSearch"
:metadata="metadata"/>
</div> </div>
<!-- --------------- --> <!-- --------------- -->
@ -513,7 +522,9 @@
localTableMetadata: [], localTableMetadata: [],
registeredViewModes: tainacan_plugin.registered_view_modes, registeredViewModes: tainacan_plugin.registered_view_modes,
openAdvancedSearch: false, openAdvancedSearch: false,
openFormAdvancedSearch: false,
advancedSearchResults: false, advancedSearchResults: false,
isDoSearch: false,
} }
}, },
props: { props: {

2
src/classes/class-tainacan-bulk-edit.php
View File

@ -108,7 +108,7 @@ class Bulk_Edit {
* Internally used to filter WP_Query and build the INSERT statement. * Internally used to filter WP_Query and build the INSERT statement.
* Must be public becaus is registered as a filter callback * Must be public becaus is registered as a filter callback
*/ */
public function add_fields_to_query($fields, &$wp_query) { public function add_fields_to_query($fields, $wp_query) {
global $wpdb; global $wpdb;
if ( $wp_query->get('fields') == 'ids' ) { // just to make sure we are in the right query if ( $wp_query->get('fields') == 'ids' ) { // just to make sure we are in the right query
$fields .= $wpdb->prepare( ", %s, %s", $this->meta_key, $this->get_id() ); $fields .= $wpdb->prepare( ", %s, %s", $this->meta_key, $this->get_id() );