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

Checks valid filter_type_object.use_max_option instead of filter_type_options.

This commit is contained in:
mateuswetah 2024-06-04 13:59:58 -03:00
parent c5785f7ffe
commit e9bee78d0f
2 changed files with 3 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/views/admin/components/filter-types/date/TainacanFilterDate.vue
View File

@ -60,16 +60,6 @@
≤  {{ $i18n.get('before_or_on_day') }}
</b-dropdown-item>
</b-dropdown>
<!-- <b-numberinput
v-if="filterTypeOptions.type == 'year'"
:placeholder="$i18n.get('instruction_type_value_year')"
:aria-labelledby="'filter-label-id-' + filter.id"
:aria-minus-label="$i18n.get('label_decrease')"
:aria-plus-label="$i18n.get('label_increase')"
size="is-small"
step="1"
@update:model-value="emitOnlyYear($event)"
v-model="yearsOnlyValue"/> -->
<b-datepicker
v-model="value"
position="is-bottom-right"
@ -105,11 +95,6 @@
$i18n.get('datepicker_month_december')
]"
@update:model-value="($event) => { resetPage(); emit($event); }" />
<!-- filterTypeOptions FOR TYPE
v-else
:type="filterTypeOptions.type == 'month' ? 'month' : null"
:placeholder="filterTypeOptions.type == 'month' ? $i18n.get('instruction_select_a_date') : $i18n.get('instruction_select_a_month')"
-->
</div>
</template>

6
src/views/admin/js/filter-types-mixin.js
View File

@ -284,8 +284,8 @@ export const dynamicFilterTypeMixin = {
if ( this.options.length < this.maxNumOptionsCheckboxList && !search )
this.noMorePage = 1;
if ( ( this.filterTypeOptions && this.filterTypeOptions.use_max_options == true && this.filter.max_options ) && this.options.length >= this.filter.max_options ) {
if ( ( this.filter.filter_type_object && this.filter.filter_type_object.use_max_options == true && this.filter.max_options ) && this.options.length >= this.filter.max_options ) {
let showViewAllButton = true;
if ( this.options.length === this.filter.max_options )
@ -357,7 +357,7 @@ export const dynamicFilterTypeMixin = {
if ( this.options.length < this.maxNumOptionsCheckboxList )
this.noMorePage = 1;
if ( ( this.filterTypeOptions && this.filterTypeOptions.use_max_options == true && this.filter.max_options ) && this.options.length >= this.filter.max_options ) {
if ( ( this.filter.filter_type_object && this.filter.filter_type_object.use_max_options == true && this.filter.max_options ) && this.options.length >= this.filter.max_options ) {
let showViewAllButton = true;
if ( this.options.length === this.filter.max_options )