From 4877455e9ccb75d323700a23ce7082b24204b404 Mon Sep 17 00:00:00 2001 From: aignatov-bio <47317017+aignatov-bio@users.noreply.github.com> Date: Mon, 21 Feb 2022 11:25:12 +0100 Subject: [PATCH] Change date operator order [SCI-6544] (#3876) Co-authored-by: Anton --- .../vue/repository_filter/filters/repositoryDateRangeValue.vue | 2 +- .../repository_filter/filters/repositoryDateTimeRangeValue.vue | 2 +- .../vue/repository_filter/filters/repositoryDateTimeValue.vue | 2 +- .../vue/repository_filter/filters/repositoryDateValue.vue | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/app/javascript/vue/repository_filter/filters/repositoryDateRangeValue.vue b/app/javascript/vue/repository_filter/filters/repositoryDateRangeValue.vue index 9b6deaeb4..fadfca103 100644 --- a/app/javascript/vue/repository_filter/filters/repositoryDateRangeValue.vue +++ b/app/javascript/vue/repository_filter/filters/repositoryDateRangeValue.vue @@ -31,9 +31,9 @@ return { timeType: 'date', operators: [ + { value: 'equal_to', label: this.i18n.t('repositories.show.repository_filter.filters.operators.date.on') }, { value: 'greater_than_or_equal_to', label: this.i18n.t('repositories.show.repository_filter.filters.operators.date.after') }, { value: 'less_than', label: this.i18n.t('repositories.show.repository_filter.filters.operators.date.before') }, - { value: 'equal_to', label: this.i18n.t('repositories.show.repository_filter.filters.operators.date.on') }, { value: 'between', label: this.i18n.t('repositories.show.repository_filter.filters.operators.between') }, { value: 'unequal_to', label: this.i18n.t('repositories.show.repository_filter.filters.operators.date.not_on') } ], diff --git a/app/javascript/vue/repository_filter/filters/repositoryDateTimeRangeValue.vue b/app/javascript/vue/repository_filter/filters/repositoryDateTimeRangeValue.vue index 7fd018529..580d5fa74 100644 --- a/app/javascript/vue/repository_filter/filters/repositoryDateTimeRangeValue.vue +++ b/app/javascript/vue/repository_filter/filters/repositoryDateTimeRangeValue.vue @@ -33,9 +33,9 @@ return { timeType: 'datetime', operators: [ + { value: 'equal_to', label: this.i18n.t('repositories.show.repository_filter.filters.operators.date.on') }, { value: 'greater_than_or_equal_to', label: this.i18n.t('repositories.show.repository_filter.filters.operators.date.after') }, { value: 'less_than', label: this.i18n.t('repositories.show.repository_filter.filters.operators.date.before') }, - { value: 'equal_to', label: this.i18n.t('repositories.show.repository_filter.filters.operators.date.on') }, { value: 'between', label: this.i18n.t('repositories.show.repository_filter.filters.operators.between') }, { value: 'unequal_to', label: this.i18n.t('repositories.show.repository_filter.filters.operators.date.not_on') } ], diff --git a/app/javascript/vue/repository_filter/filters/repositoryDateTimeValue.vue b/app/javascript/vue/repository_filter/filters/repositoryDateTimeValue.vue index 9699ccffa..0814775a2 100644 --- a/app/javascript/vue/repository_filter/filters/repositoryDateTimeValue.vue +++ b/app/javascript/vue/repository_filter/filters/repositoryDateTimeValue.vue @@ -54,9 +54,9 @@ tooltip: this.i18n.t('repositories.show.repository_filter.filters.operators.tooltips.last_year') } }, { value: '', label: '', params: { delimiter: true } }, + { value: 'equal_to', label: this.i18n.t('repositories.show.repository_filter.filters.operators.date.on') }, { value: 'greater_than_or_equal_to', label: this.i18n.t('repositories.show.repository_filter.filters.operators.date.after') }, { value: 'less_than', label: this.i18n.t('repositories.show.repository_filter.filters.operators.date.before') }, - { value: 'equal_to', label: this.i18n.t('repositories.show.repository_filter.filters.operators.date.on') }, { value: 'between', label: this.i18n.t('repositories.show.repository_filter.filters.operators.between') }, { value: 'unequal_to', label: this.i18n.t('repositories.show.repository_filter.filters.operators.date.not_on') } ], diff --git a/app/javascript/vue/repository_filter/filters/repositoryDateValue.vue b/app/javascript/vue/repository_filter/filters/repositoryDateValue.vue index 23d5dcfb5..42e789260 100644 --- a/app/javascript/vue/repository_filter/filters/repositoryDateValue.vue +++ b/app/javascript/vue/repository_filter/filters/repositoryDateValue.vue @@ -52,9 +52,9 @@ tooltip: this.i18n.t('repositories.show.repository_filter.filters.operators.tooltips.last_year') } }, { value: '', label: '', params: { delimiter: true } }, + { value: 'equal_to', label: this.i18n.t('repositories.show.repository_filter.filters.operators.date.on') }, { value: 'greater_than_or_equal_to', label: this.i18n.t('repositories.show.repository_filter.filters.operators.date.after') }, { value: 'less_than', label: this.i18n.t('repositories.show.repository_filter.filters.operators.date.before') }, - { value: 'equal_to', label: this.i18n.t('repositories.show.repository_filter.filters.operators.date.on') }, { value: 'between', label: this.i18n.t('repositories.show.repository_filter.filters.operators.between') }, { value: 'unequal_to', label: this.i18n.t('repositories.show.repository_filter.filters.operators.date.not_on') } ],