{
selectedRows.clear()
}
+const reorder = () => {
+ rows.value.forEach((row, index) => {
+ row.idx = index + 1
+ })
+}
+
+
function fieldChange(value, field, row) {
triggerOnChange(field.fieldname, value, row)
}
diff --git a/frontend/src/components/Modals/OrganizationModal.vue b/frontend/src/components/Modals/OrganizationModal.vue
index fad8da49..f419e32e 100644
--- a/frontend/src/components/Modals/OrganizationModal.vue
+++ b/frontend/src/components/Modals/OrganizationModal.vue
@@ -108,6 +108,7 @@ async function createOrganization() {
onError: (err) => {
if (err.error.exc_type == 'ValidationError') {
error.value = err.error?.messages?.[0]
+ loading.value = false
}
},
},
diff --git a/frontend/src/components/Settings/General/HomeActions.vue b/frontend/src/components/Settings/General/HomeActions.vue
index dba527bf..eca55dc2 100644
--- a/frontend/src/components/Settings/General/HomeActions.vue
+++ b/frontend/src/components/Settings/General/HomeActions.vue
@@ -17,8 +17,8 @@
:label="__('Update')"
icon-left="plus"
variant="solid"
- :disabled="!settings.isDirty"
- :loading="settings.loading"
+ :disabled="!document.isDirty"
+ :loading="document.loading"
@click="updateSettings"
/>
@@ -27,7 +27,7 @@
import Grid from '@/components/Controls/Grid.vue'
import { ErrorMessage } from 'frappe-ui'
-import { getSettings } from '@/stores/settings'
import { showSettings } from '@/composables/settings'
-import { ref } from 'vue'
+import { useDocument } from '@/data/document'
+import { ref, provide } from 'vue'
-const { _settings: settings } = getSettings()
+const { document, triggerOnChange } = useDocument(
+ 'FCRM Settings',
+ 'FCRM Settings',
+)
+
+provide('triggerOnChange', triggerOnChange)
const emit = defineEmits(['updateStep'])
const errorMessage = ref('')
function updateSettings() {
- settings.save.submit(null, {
+ document.save.submit(null, {
onSuccess: () => {
showSettings.value = false
},
diff --git a/frontend/src/components/ViewControls.vue b/frontend/src/components/ViewControls.vue
index 0a057734..238b2047 100644
--- a/frontend/src/components/ViewControls.vue
+++ b/frontend/src/components/ViewControls.vue
@@ -939,9 +939,9 @@ async function updateKanbanSettings(data) {
value: data.to,
})
}
- let isDirty = viewUpdated.value
viewUpdated.value = true
+
if (!defaultParams.value) {
defaultParams.value = getParams()
}
@@ -969,26 +969,6 @@ async function updateKanbanSettings(data) {
if (!route.query.view) {
createOrUpdateStandardView()
- } else if (!data.column_field) {
- if (isDirty) {
- $dialog({
- title: __('Unsaved Changes'),
- message: __('You have unsaved changes. Do you want to save them?'),
- variant: 'danger',
- actions: [
- {
- label: __('Update'),
- variant: 'solid',
- onClick: (close) => {
- updateCustomView()
- close()
- },
- },
- ],
- })
- } else {
- updateCustomView()
- }
}
}
@@ -1042,31 +1022,6 @@ function createOrUpdateStandardView() {
})
}
-function updateCustomView() {
- viewUpdated.value = false
- view.value = {
- doctype: props.doctype,
- label: view.value.label,
- type: view.value.type || 'list',
- icon: view.value.icon,
- name: view.value.name,
- filters: defaultParams.value.filters,
- order_by: defaultParams.value.order_by,
- group_by_field: defaultParams.value.view.group_by_field,
- column_field: defaultParams.value.column_field,
- title_field: defaultParams.value.title_field,
- kanban_columns: defaultParams.value.kanban_columns,
- kanban_fields: defaultParams.value.kanban_fields,
- columns: defaultParams.value.columns,
- rows: defaultParams.value.rows,
- route_name: route.name,
- load_default_columns: view.value.load_default_columns,
- }
- call('crm.fcrm.doctype.crm_view_settings.crm_view_settings.update', {
- view: view.value,
- }).then(() => reloadView())
-}
-
function updatePageLength(value, loadMore = false) {
if (list.value.loading) return
if (!defaultParams.value) {