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

Adds default value for max_options, Fixes Pagination (issue #83)

This commit is contained in:
weryques 2018-08-02 16:42:15 -03:00
parent cd70c24527
commit 181151e444
5 changed files with 37 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
src/admin/components/other/checkbox-filter-modal.vue
View File

@ -24,13 +24,19 @@
v-if="!isSearching && !isTaxonomy"
class="modal-card-body tainacan-checkbox-list-container">
<a
v-if="checkboxListOffset"
role="button"
class="tainacan-checkbox-list-page-changer"
@click="beforePage">
<b-icon
icon="chevron-left"/>
</a>
<ul class="tainacan-modal-checkbox-list-body">
<ul
:class="{
'tainacan-modal-checkbox-list-body-dynamic-m-l': !checkboxListOffset,
'tainacan-modal-checkbox-list-body-dynamic-m-r': noMorePage,
}"
class="tainacan-modal-checkbox-list-body">
<li
class="tainacan-li-checkbox-list"
v-for="(option, key) in options"
@ -46,6 +52,7 @@
:active.sync="isCheckboxListLoading"/>
</ul>
<a
v-if="!noMorePage"
role="button"
class="tainacan-checkbox-list-page-changer"
@click="nextPage">
@ -196,6 +203,7 @@
collection: this.collection_id,
isCheckboxListLoading: false,
isSearchingLoading: false,
noMorePage: 0,
}
},
created() {
@ -208,10 +216,12 @@
methods: {
beforePage(){
this.checkboxListOffset -= this.maxNumOptionsCheckboxList;
this.noMorePage = 0;
//console.log(this.checkboxListOffset, this.maxNumOptionsCheckboxList);
if(this.checkboxListOffset < 0){
this.checkboxListOffset = 0;
return;
}
this.isCheckboxListLoading = true;
@ -219,7 +229,12 @@
this.getOptions(this.checkboxListOffset);
},
nextPage(){
this.checkboxListOffset = this.options.length;
if(!this.noMorePage) {
this.checkboxListOffset += this.maxNumOptionsCheckboxList - 1;
}
// 0 20 / 19 20 / 39 20 / 59 20
//console.log(this.checkboxListOffset, this.maxNumOptionsCheckboxList);
this.isCheckboxListLoading = true;
@ -611,6 +626,15 @@
flex-direction: column;
flex-wrap: wrap;
padding: 0 !important;
max-height: 253px;
}
.tainacan-modal-checkbox-list-body-dynamic-m-l {
margin-left: 34px !important;
}
.tainacan-modal-checkbox-list-body-dynamic-m-r {
margin-right: 34px !important;
}
.tainacan-search-results-container {
@ -623,6 +647,7 @@
display: flex;
flex-direction: column;
flex-wrap: wrap;
max-height: 253px;
}
.tainacan-li-no-children {

4
src/classes/filter-types/checkbox/Checkbox.vue
View File

@ -112,9 +112,9 @@
let collectionTarget = ( this.metadatum_object && this.metadatum_object.metadata_type_options.collection_id ) ?
this.metadatum_object.metadata_type_options.collection_id : this.collection_id;
promise = this.getValuesRelationship( collectionTarget, null, null, 0, this.filter.max_options);
promise = this.getValuesRelationship( collectionTarget, null, [], 0, this.filter.max_options);
} else {
promise = this.getValuesPlainText( this.metadatum, null, this.isRepositoryLevel, 0, this.filter.max_options );
promise = this.getValuesPlainText( this.metadatum, null, this.isRepositoryLevel, [], 0, this.filter.max_options );
}
promise.then(() => {

4
src/classes/filter-types/filter-types-mixin.js
View File

@ -76,6 +76,8 @@ export const filter_type_mixin = {
if (opts.length) {
this.options = opts;
} else {
this.noMorePage = 1;
}
if (this.filter.max_options && this.options.length >= this.filter.max_options) {
@ -145,6 +147,8 @@ export const filter_type_mixin = {
if (opts.length) {
this.options = opts;
} else {
this.noMorePage = 1;
}
if (this.filter.max_options && this.options.length >= this.filter.max_options) {

3
src/classes/repositories/class-tainacan-filters.php
View File

@ -90,7 +90,8 @@ class Filters extends Repository {
'title' => __( 'Max of options', 'tainacan' ),
'type' => 'integer/string',
'description' => __( 'The max number of options to be showed in filter sidebar.', 'tainacan' ),
'validation' => ''
'validation' => '',
'default' => 4
]
]);
}

2
src/classes/repositories/class-tainacan-metadata.php
View File

@ -860,7 +860,7 @@ class Metadata extends Repository {
$pagination = '';
if($offset >= 0 && $number >= 1){
$pagination = $wpdb->prepare("LIMIT %d, %d", (int) $offset, (int) $number);
$pagination = $wpdb->prepare("LIMIT %d,%d", (int) $offset, (int) $number);
}
// If no has logged user or actual user can not read private posts