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

fix: use fieldname & fieldtype instead of name & type in settings page

Browse Source
This commit is contained in:
Shariq Ansari 2025-01-02 20:52:14 +05:30
parent 81c99fde16
commit 7f2ccef7c8
2 changed files with 9 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
crm/api/doc.py
View File

@ -660,22 +660,7 @@ def get_fields(doctype: str, allow_all_fieldtypes: bool = False):
for field in fields: for field in fields:
if field.fieldtype not in not_allowed_fieldtypes and field.fieldname: if field.fieldtype not in not_allowed_fieldtypes and field.fieldname:
_fields.append( _fields.append(field)
{
"label": field.label,
"type": field.fieldtype,
"value": field.fieldname,
"options": field.options,
"mandatory": field.reqd,
"read_only": field.read_only,
"hidden": field.hidden,
"depends_on": field.depends_on,
"mandatory_depends_on": field.mandatory_depends_on,
"read_only_depends_on": field.read_only_depends_on,
"link_filters": field.get("link_filters"),
"placeholder": field.get("placeholder"),
}
)
return _fields return _fields

28
frontend/src/components/Settings/SettingsPage.vue
View File

@ -42,7 +42,7 @@ import {
Badge, Badge,
ErrorMessage, ErrorMessage,
} from 'frappe-ui' } from 'frappe-ui'
import { evaluateDependsOnValue, createToast, getRandom } from '@/utils' import { createToast, getRandom } from '@/utils'
import { ref, computed } from 'vue' import { ref, computed } from 'vue'
const props = defineProps({ const props = defineProps({
@ -117,10 +117,10 @@ const tabs = computed(() => {
fieldsData.forEach((field) => { fieldsData.forEach((field) => {
let last_tab = _tabs[_tabs.length - 1] let last_tab = _tabs[_tabs.length - 1]
let _sections = _tabs.length ? last_tab.sections : [] let _sections = _tabs.length ? last_tab.sections : []
if (field.type === 'Tab Break') { if (field.fieldtype === 'Tab Break') {
_tabs.push({ _tabs.push({
label: field.label, label: field.label,
name: field.value, name: field.fieldname,
sections: [ sections: [
{ {
name: 'section_' + getRandom(), name: 'section_' + getRandom(),
@ -128,33 +128,21 @@ const tabs = computed(() => {
}, },
], ],
}) })
} else if (field.type === 'Section Break') { } else if (field.fieldtype === 'Section Break') {
_sections.push({ _sections.push({
label: field.label, label: field.label,
name: field.value, name: field.fieldname,
columns: [{ name: 'column_' + getRandom(), fields: [] }], columns: [{ name: 'column_' + getRandom(), fields: [] }],
}) })
} else if (field.type === 'Column Break') { } else if (field.fieldtype === 'Column Break') {
_sections[_sections.length - 1].columns.push({ _sections[_sections.length - 1].columns.push({
name: field.value, name: field.fieldname,
fields: [], fields: [],
}) })
} else { } else {
let last_section = _sections[_sections.length - 1] let last_section = _sections[_sections.length - 1]
let last_column = last_section.columns[last_section.columns.length - 1] let last_column = last_section.columns[last_section.columns.length - 1]
last_column.fields.push({ last_column.fields.push(field)
...field,
filters: field.link_filters && JSON.parse(field.link_filters),
display_via_depends_on: evaluateDependsOnValue(
field.depends_on,
data.doc,
),
mandatory_via_depends_on: evaluateDependsOnValue(
field.mandatory_depends_on,
data.doc,
),
name: field.value,
})
} }
}) })