TheCloneArmy/crater
1
0
Fork 1
mirror of https://github.com/crater-invoice/crater.git synced 2025-10-27 11:41:09 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'fix-default-language-filter-issue' into 'master'

Browse Source 
fixed search filter is not working

See merge request mohit.panjvani/crater-web!1461
This commit is contained in:
Mohit Panjwani
2022-03-04 10:47:23 +00:00
parent 83a7c97e9e f6771dafd3
commit ee0632f0d3
10 changed files with 15 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
resources/scripts/admin/components/modal-components/BackupModal.vue
View File

@ -51,7 +51,7 @@
label="name" label="name"
value-prop="id" value-prop="id"
:placeholder="$t('settings.disk.select_disk')" :placeholder="$t('settings.disk.select_disk')"
track-by="id" track-by="name"
object object
/> />
</BaseInputGroup> </BaseInputGroup>

4
resources/scripts/admin/components/modal-components/ExchangeRateProviderModal.vue
View File

@ -38,6 +38,7 @@
label="key" label="key"
:searchable="true" :searchable="true"
:invalid="v$.currentExchangeRate.driver.$error" :invalid="v$.currentExchangeRate.driver.$error"
track-by="key"
@update:modelValue="resetCurrency" @update:modelValue="resetCurrency"
@input="v$.currentExchangeRate.driver.$touch()" @input="v$.currentExchangeRate.driver.$touch()"
/> />
@ -60,6 +61,7 @@
:options="serverOptions" :options="serverOptions"
:invalid="v$.currencyConverter.type.$error" :invalid="v$.currencyConverter.type.$error"
label="value" label="value"
track-by="value"
@update:modelValue="resetCurrency" @update:modelValue="resetCurrency"
/> />
</BaseInputGroup> </BaseInputGroup>
@ -104,8 +106,8 @@
:invalid="v$.currentExchangeRate.currencies.$error" :invalid="v$.currentExchangeRate.currencies.$error"
label="code" label="code"
track-by="code" track-by="code"
open-direction="top"
@input="v$.currentExchangeRate.currencies.$touch()" @input="v$.currentExchangeRate.currencies.$touch()"
openDirection="top"
/> />
</BaseInputGroup> </BaseInputGroup>
<!-- For Currency Converter --> <!-- For Currency Converter -->

4
resources/scripts/admin/components/modal-components/ItemModal.vue
View File

@ -50,7 +50,7 @@
:can-clear="false" :can-clear="false"
:placeholder="$t('items.select_a_unit')" :placeholder="$t('items.select_a_unit')"
searchable searchable
track-by="id" track-by="name"
/> />
</BaseInputGroup> </BaseInputGroup>
@ -67,7 +67,7 @@
:can-deselect="false" :can-deselect="false"
:can-clear="false" :can-clear="false"
searchable searchable
track-by="id" track-by="name"
object object
/> />
</BaseInputGroup> </BaseInputGroup>

1
resources/scripts/admin/components/modal-components/disks/DoSpacesDisk.vue
View File

@ -35,6 +35,7 @@
searchable searchable
label="name" label="name"
:can-deselect="false" :can-deselect="false"
track-by="name"
@update:modelValue="onChangeDriver(data)" @update:modelValue="onChangeDriver(data)"
/> />
</BaseInputGroup> </BaseInputGroup>

4
resources/scripts/admin/views/installation/Step8CompanyPreferences.vue
View File

@ -48,7 +48,7 @@
value-prop="code" value-prop="code"
:placeholder="$tc('settings.preferences.select_language')" :placeholder="$tc('settings.preferences.select_language')"
class="w-full" class="w-full"
track-by="code" track-by="name"
:searchable="true" :searchable="true"
:invalid="v$.currentPreferences.language.$error" :invalid="v$.currentPreferences.language.$error"
/> />
@ -95,7 +95,7 @@
label="key" label="key"
value-prop="value" value-prop="value"
:placeholder="$tc('settings.preferences.select_time_zone')" :placeholder="$tc('settings.preferences.select_time_zone')"
track-by="value" track-by="key"
:searchable="true" :searchable="true"
:invalid="v$.currentPreferences.time_zone.$error" :invalid="v$.currentPreferences.time_zone.$error"
/> />

2
resources/scripts/admin/views/settings/AccountSetting.vue
View File

@ -75,7 +75,7 @@
:options="globalStore.config.languages" :options="globalStore.config.languages"
label="name" label="name"
value-prop="code" value-prop="code"
track-by="code" track-by="name"
open-direction="top" open-direction="top"
/> />
</BaseInputGroup> </BaseInputGroup>

2
resources/scripts/admin/views/settings/BackupSetting.vue
View File

@ -23,7 +23,7 @@
v-model="filters.selected_disk" v-model="filters.selected_disk"
:content-loading="isFetchingInitialData" :content-loading="isFetchingInitialData"
:options="getDisksOptions" :options="getDisksOptions"
track-by="id" track-by="name"
:placeholder="$t('settings.disk.select_disk')" :placeholder="$t('settings.disk.select_disk')"
label="name" label="name"
:searchable="true" :searchable="true"

4
resources/scripts/admin/views/settings/PreferencesSetting.vue
View File

@ -40,7 +40,7 @@
label="name" label="name"
value-prop="code" value-prop="code"
class="w-full" class="w-full"
track-by="code" track-by="name"
:searchable="true" :searchable="true"
:invalid="v$.language.$error" :invalid="v$.language.$error"
/> />
@ -79,7 +79,7 @@
:options="globalStore.dateFormats" :options="globalStore.dateFormats"
label="display_date" label="display_date"
value-prop="carbon_format_value" value-prop="carbon_format_value"
track-by="carbon_format_value" track-by="display_date"
searchable searchable
:invalid="v$.carbon_date_format.$error" :invalid="v$.carbon_date_format.$error"
class="w-full" class="w-full"

1
resources/scripts/admin/views/users/Create.vue
View File

@ -70,6 +70,7 @@
searchable searchable
:can-deselect="false" :can-deselect="false"
class="w-full" class="w-full"
track-by="name"
/> />
</BaseInputGroup> </BaseInputGroup>

2
resources/scripts/components/base/BaseItemSelect.vue
View File

@ -30,7 +30,7 @@
v-model="itemSelect" v-model="itemSelect"
:content-loading="contentLoading" :content-loading="contentLoading"
value-prop="id" value-prop="id"
track-by="id" track-by="name"
:invalid="invalid" :invalid="invalid"
preserve-search preserve-search
:initial-search="itemData.name" :initial-search="itemData.name"