From 6bd5935d3c2af23fce6545e980fd8ec15d95569b Mon Sep 17 00:00:00 2001 From: sedum Date: Sat, 10 Dec 2022 19:33:32 +0100 Subject: [PATCH] whereinput don't search address if not allow_geolocation --- components/WhereInput.vue | 29 +++++++++++++++-------------- pages/add/_edit.vue | 5 +++-- 2 files changed, 18 insertions(+), 16 deletions(-) diff --git a/components/WhereInput.vue b/components/WhereInput.vue index 68517cc3..ea002708 100644 --- a/components/WhereInput.vue +++ b/components/WhereInput.vue @@ -22,16 +22,17 @@ v-row.mb-4 v-list-item-title(v-text='item.name') v-list-item-subtitle(v-text='item.address') - //- v-text-field( - //- ref='address' - //- :prepend-icon='mdiMap' - //- :disabled='disableAddress' - //- :rules="[ v => disableAddress ? true : $validators.required('common.address')(v)]" - //- :label="$t('common.address')" - //- @change="changeAddress" - //- :value="value.address") + v-col(cols=12 md=6) - v-combobox(ref='address' + v-text-field(v-if="!settings.allow_geolocation" + ref='address' + :prepend-icon='mdiMap' + :disabled='disableAddress' + :rules="[ v => disableAddress ? true : $validators.required('common.address')(v)]" + :label="$t('common.address')" + @change="changeAddress" + :value="value.address") + v-combobox(ref='address' v-if="settings.allow_geolocation" :prepend-icon='mdiMapSearch' :disabled='disableAddress' @input.native='searchAddress' @@ -182,11 +183,11 @@ export default { } this.$emit('input', { ...this.place }) }, - // changeAddress (v) { - // this.place.address = v - // this.$emit('input', { ...this.place }) - // this.disableDetails = false - // }, + changeAddress (v) { + this.place.address = v + this.$emit('input', { ...this.place }) + this.disableDetails = false + }, selectAddress (v) { if (!v) { return } if (typeof v === 'object') { diff --git a/pages/add/_edit.vue b/pages/add/_edit.vue index 1b97dd4f..5c58d976 100644 --- a/pages/add/_edit.vue +++ b/pages/add/_edit.vue @@ -101,9 +101,9 @@ export default { if (params.edit && !store.state.auth.loggedIn) { return error({ statusCode: 401, message: 'Not allowed'}) } - + return true - + }, async asyncData({ params, $axios, error, $auth, store }) { if (params.edit) { @@ -179,6 +179,7 @@ export default { filteredTags() { if (!this.tagName) { return this.tags.slice(0, 10).map(t => t.tag) } const tagName = this.tagName.trim().toLowerCase() + console.log(tagName) return this.tags.filter(t => t.tag.toLowerCase().includes(tagName)).map(t => t.tag) } },