scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2025-10-24 12:46:39 +08:00
Code Issues Projects Releases Packages Wiki Activity

Fix validation for number field in filters [SCI-6510] (#3836)

Browse source 
Co-authored-by: Anton <anton@scinote.net>
This commit is contained in:
aignatov-bio 2022-02-11 10:41:25 +01:00 • committed by GitHub
parent bc5822de7b
commit ad5326011f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
app/javascript/vue/repository_filter/filters/repositoryNumberValue.vue
View file

@ -12,7 +12,7 @@
<div v-if="operator !== 'between'" class="sci-input-container">
<input
class="sci-input-field"
type="number"
type="text"
name="value"
v-model="value"
:placeholder= "this.i18n.t('repositories.show.repository_filter.filters.types.RepositoryNumberValue.input_placeholder',{name: this.filter.column.name})"
@ -60,6 +60,7 @@
{ value: 'less_than_or_equal_to', label: this.i18n.t('repositories.show.repository_filter.filters.operators.less_than_or_equal_to') },
{ value: 'between', label: this.i18n.t('repositories.show.repository_filter.filters.operators.between') }
],
numberRegexp: /[^0-9.]/g,
operator: 'equal_to',
value: '',
from: '',
@ -75,18 +76,22 @@
from: this.from,
to: this.to
};
}
},
},
watch: {
operator() {
if(this.operator !== 'between' && !(typeof this.value === 'string')) this.value = '';
if(this.operator === 'between') this.value = {to: '', from: ''};
},
value() {
if (this.operator === 'between') {
this.value = {
from: this.from.replace(this.numberRegexp, '').match(/^\d*(\.\d{0,10})?/)[0],
to: this.to.replace(this.numberRegexp, '').match(/^\d*(\.\d{0,10})?/)[0]
};
this.parameters = this.value;
} else {
this.value = this.value.replace(this.numberRegexp, '').match(/^\d*(\.\d{0,10})?/)[0]
this.parameters = { number: this.value }
}
this.updateFilter();