test/crm
1
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: userSettings not getting updated if dont for the first time

Browse Source
This commit is contained in:
Shariq Ansari 2024-12-30 17:32:31 +05:30
parent bfc72bfb6e
commit e8e25525f1
3 changed files with 9 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
frontend/src/components/Controls/Grid.vue
View File

@ -1,5 +1,5 @@
<template> <template>
<div class="flex flex-col text-base"> <div class="flex flex-col flex-1 text-base">
<div v-if="label" class="mb-1.5 text-sm text-ink-gray-5"> <div v-if="label" class="mb-1.5 text-sm text-ink-gray-5">
{{ __(label) }} {{ __(label) }}
</div> </div>
@ -244,6 +244,7 @@ const props = defineProps({
const { getGridViewSettings, getFields, getGridSettings } = getMeta( const { getGridViewSettings, getFields, getGridSettings } = getMeta(
props.doctype, props.doctype,
) )
getMeta(props.parentDoctype)
const rows = defineModel() const rows = defineModel()
const showRowList = ref(new Array(rows.value?.length || []).fill(false)) const showRowList = ref(new Array(rows.value?.length || []).fill(false))

10
frontend/src/components/Controls/GridFieldsEditorModal.vue
View File

@ -107,7 +107,7 @@ const props = defineProps({
parentDoctype: String, parentDoctype: String,
}) })
const { userSettings, getFields, getGridViewSettings, saveUserSettings } = getMeta( const { getFields, getGridViewSettings, saveUserSettings } = getMeta(
props.doctype, props.doctype,
) )
@ -175,14 +175,6 @@ function update() {
saveUserSettings(props.parentDoctype, 'GridView', updateFields, () => { saveUserSettings(props.parentDoctype, 'GridView', updateFields, () => {
loading.value = false loading.value = false
show.value = false show.value = false
if (userSettings[props.parentDoctype]?.['GridView']) {
userSettings[props.parentDoctype]['GridView'][props.doctype] =
updateFields
} else {
userSettings[props.parentDoctype] = {
GridView: { [props.doctype]: updateFields },
}
}
}) })
} }

8
frontend/src/stores/meta.js
View File

@ -81,7 +81,7 @@ export function getMeta(doctype) {
} }
function saveUserSettings(parentDoctype, key, value, callback) { function saveUserSettings(parentDoctype, key, value, callback) {
let oldUserSettings = userSettings[parentDoctype] let oldUserSettings = userSettings[parentDoctype] || {}
let newUserSettings = JSON.parse(JSON.stringify(oldUserSettings)) let newUserSettings = JSON.parse(JSON.stringify(oldUserSettings))
if (newUserSettings[key] === undefined) { if (newUserSettings[key] === undefined) {
@ -98,9 +98,13 @@ export function getMeta(doctype) {
user_settings: JSON.stringify(newUserSettings), user_settings: JSON.stringify(newUserSettings),
}, },
auto: true, auto: true,
onSuccess: () => callback?.(), onSuccess: () => {
userSettings[parentDoctype] = newUserSettings
callback?.()
},
}) })
} }
userSettings[parentDoctype] = newUserSettings
return callback?.() return callback?.()
} }