New exhibition comportament of advanced search form and fixes error in bulk edit
This commit is contained in:
weryques
parent
24d4106b37
commit
dc6592e795
|
|
@ -3,6 +3,7 @@
|
|||
<div class="columns is-multiline tnc-advanced-search-container">
|
||||
|
||||
<div
|
||||
v-show="!advancedSearchResults"
|
||||
v-for="searchCriteria in searchCriterias"
|
||||
:key="searchCriteria"
|
||||
class="field column is-12 tainacan-form">
|
||||
|
|
@ -92,6 +93,7 @@
|
|||
|
||||
<!-- Add button -->
|
||||
<div
|
||||
v-show="!advancedSearchResults"
|
||||
:style="{'padding-left': '25px !important'}"
|
||||
class="field column is-12">
|
||||
<a
|
||||
|
|
@ -105,8 +107,9 @@
|
|||
</div>
|
||||
|
||||
<!-- Tags -->
|
||||
<div
|
||||
class="field column is-12">
|
||||
<div
|
||||
v-show="advancedSearchResults"
|
||||
class="field column is-12">
|
||||
<b-field
|
||||
grouped
|
||||
group-multiline>
|
||||
|
|
@ -114,8 +117,8 @@
|
|||
v-for="searchCriteria in searchCriterias"
|
||||
:key="searchCriteria"
|
||||
class="control taginput-container">
|
||||
<b-tag
|
||||
v-if="(advancedSearchQuery.taxquery[searchCriteria] && advancedSearchQuery.taxquery[searchCriteria].terms)"
|
||||
<b-tag
|
||||
v-if="advancedSearchQuery.taxquery[searchCriteria] && advancedSearchQuery.taxquery[searchCriteria].terms"
|
||||
type="is-white"
|
||||
class="is-rounded"
|
||||
@close="removeThis(searchCriteria)"
|
||||
|
|
@ -126,7 +129,7 @@
|
|||
advancedSearchQuery.taxquery[searchCriteria].btags }}
|
||||
</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"
|
||||
class="is-rounded"
|
||||
@close="removeThis(searchCriteria)"
|
||||
|
|
@ -140,7 +143,9 @@
|
|||
</div>
|
||||
|
||||
<!-- Clear and search button -->
|
||||
<div class="column">
|
||||
<div
|
||||
v-show="!advancedSearchResults"
|
||||
class="column">
|
||||
<div class="field is-grouped is-pulled-right">
|
||||
<p class="control">
|
||||
<button
|
||||
|
|
@ -170,6 +175,14 @@
|
|||
props: {
|
||||
metadata: Array,
|
||||
isRepositoryLevel: false,
|
||||
advancedSearchResults: false,
|
||||
openFormAdvancedSearch: false,
|
||||
isDoSearch: false,
|
||||
},
|
||||
watch: {
|
||||
isDoSearch(){
|
||||
this.searchAdvanced();
|
||||
}
|
||||
},
|
||||
created(){
|
||||
let locale = navigator.language;
|
||||
|
|
|
|||
|
|
@ -307,36 +307,45 @@
|
|||
<!-- ADVANCED SEARCH -->
|
||||
<div
|
||||
v-if="openAdvancedSearch">
|
||||
<b-collapse
|
||||
class="show"
|
||||
:open="advancedSearchResults ? false : true">
|
||||
<div class="columns tnc-advanced-search-close">
|
||||
|
||||
<div class="column">
|
||||
<div
|
||||
slot="trigger"
|
||||
slot-scope="props"
|
||||
class="columns tnc-advanced-search-close">
|
||||
<div class="column">
|
||||
class="field is-grouped is-pulled-right">
|
||||
<p
|
||||
v-if="advancedSearchResults"
|
||||
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
|
||||
@click="openAdvancedSearch = false"
|
||||
class="button is-white is-pulled-right">
|
||||
class="button is-white">
|
||||
<b-icon
|
||||
size="is-small"
|
||||
icon="close"/>
|
||||
</button>
|
||||
<button
|
||||
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>
|
||||
</p>
|
||||
</div>
|
||||
<advanced-search
|
||||
:is-repository-level="isRepositoryLevel"
|
||||
:metadata="metadata" />
|
||||
</b-collapse>
|
||||
|
||||
</div>
|
||||
|
||||
</div>
|
||||
<advanced-search
|
||||
:is-repository-level="isRepositoryLevel"
|
||||
:advanced-search-results="advancedSearchResults"
|
||||
:open-form-advanced-search="openFormAdvancedSearch"
|
||||
:is-do-search="isDoSearch"
|
||||
:metadata="metadata"/>
|
||||
</div>
|
||||
|
||||
<!-- --------------- -->
|
||||
|
|
@ -513,7 +522,9 @@
|
|||
localTableMetadata: [],
|
||||
registeredViewModes: tainacan_plugin.registered_view_modes,
|
||||
openAdvancedSearch: false,
|
||||
openFormAdvancedSearch: false,
|
||||
advancedSearchResults: false,
|
||||
isDoSearch: false,
|
||||
}
|
||||
},
|
||||
props: {
|
||||
|
|
|
|||
|
|
@ -108,7 +108,7 @@ class Bulk_Edit {
|
|||
* Internally used to filter WP_Query and build the INSERT statement.
|
||||
* 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;
|
||||
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() );
|
||||
|
|
|
|||
Loading…
Reference in New Issue