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

Prepares components for new object of last_term.

This commit is contained in:
mateuswetah 2020-06-29 11:47:11 -03:00
parent 53ce3532ff
commit e6d11d5d5a
3 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/views/admin/components/modals/checkbox-radio-modal.vue
View File

@ -471,7 +471,7 @@
if (this.isUsingElasticSearch) { if (this.isUsingElasticSearch) {
this.checkboxListOffset = res.data.last_term; this.checkboxListOffset = res.data.last_term.es_term;
if (!this.lastTermOnFisrtPage || this.lastTermOnFisrtPage == this.checkboxListOffset) { if (!this.lastTermOnFisrtPage || this.lastTermOnFisrtPage == this.checkboxListOffset) {
this.lastTermOnFisrtPage = this.checkboxListOffset; this.lastTermOnFisrtPage = this.checkboxListOffset;
@ -582,7 +582,7 @@
this.totalRemaining = Object.assign({}, this.totalRemaining, { this.totalRemaining = Object.assign({}, this.totalRemaining, {
[`${column == undefined ? 0 : column+1}`]: { [`${column == undefined ? 0 : column+1}`]: {
remaining: this.isUsingElasticSearch ? (children.length > 0 ? res.data.last_term != '' : false) : res.headers['x-wp-total'], remaining: this.isUsingElasticSearch ? (children.length > 0 ? res.data.last_term.value == children[children.length - 1].value : false) : res.headers['x-wp-total'],
} }
}); });
@ -598,9 +598,9 @@
} }
if (first != undefined) { if (first != undefined) {
this.finderColumns.splice(first, 1, { children: children, lastTerm: res.data.last_term }); this.finderColumns.splice(first, 1, { children: children, lastTerm: res.data.last_term.es_term });
} else { } else {
this.finderColumns.push({ children: children, lastTerm: res.data.last_term }); this.finderColumns.push({ children: children, lastTerm: res.data.last_term.es_term });
} }
}, },
appendMore(options, key, lastTerm) { appendMore(options, key, lastTerm) {
@ -673,11 +673,11 @@
axios.get(route) axios.get(route)
.then(res => { .then(res => {
this.appendMore(res.data.values, key, res.data.last_term); this.appendMore(res.data.values, key, res.data.last_term.es_term);
this.totalRemaining = Object.assign({}, this.totalRemaining, { this.totalRemaining = Object.assign({}, this.totalRemaining, {
[`${key}`]: { [`${key}`]: {
remaining: this.isUsingElasticSearch ? (res.data.values.length > 0 ? (res.data.last_term == res.data.values[res.data.values.length - 1].value) : false) : res.headers['x-wp-total'], remaining: this.isUsingElasticSearch ? (res.data.values.length > 0 ? (res.data.last_term.value == res.data.values[res.data.values.length - 1].value) : false) : res.headers['x-wp-total'],
} }
}); });

2
src/views/gutenberg-blocks/tainacan-facets/facets-list/facets-list-theme.vue
View File

@ -266,7 +266,7 @@ export default {
this.isLoading = false; this.isLoading = false;
this.totalFacets = Number(response.headers['x-wp-total']); this.totalFacets = Number(response.headers['x-wp-total']);
this.lastTerm = response.data.values.length > 0 ? response.data.last_term : ''; this.lastTerm = response.data.values.length > 0 ? response.data.last_term.es_term : '';
}).catch(() => { }).catch(() => {
this.isLoading = false; this.isLoading = false;

2
src/views/gutenberg-blocks/tainacan-facets/facets-list/parent-term-modal.js
View File

@ -80,7 +80,7 @@ export default class ParentTermModal extends React.Component {
modalFacets: otherModalFacets, modalFacets: otherModalFacets,
totalModalFacets: response.headers['x-wp-total'], totalModalFacets: response.headers['x-wp-total'],
offset: this.state.offset + response.data.values.length, offset: this.state.offset + response.data.values.length,
lastTerm: response.data.last_term lastTerm: response.data.last_term.es_term
}); });
return otherModalFacets; return otherModalFacets;