fix: added @me in user link field

This commit is contained in:
Shariq Ansari 2024-01-19 23:30:19 +05:30
parent cc1ac48d59
commit baaa249375
2 changed files with 21 additions and 5 deletions

View File

@ -72,6 +72,14 @@ def get_list_data(
custom_view = False custom_view = False
filters = frappe._dict(filters) filters = frappe._dict(filters)
for key in filters:
value = filters[key]
if isinstance(value, list):
if "@me" in value:
value[value.index("@me")] = frappe.session.user
elif value == "@me":
filters[key] = frappe.session.user
if default_filters: if default_filters:
default_filters = frappe.parse_json(default_filters) default_filters = frappe.parse_json(default_filters)
filters.update(default_filters) filters.update(default_filters)
@ -98,11 +106,11 @@ def get_list_data(
rows = frappe.parse_json(list_view_settings.rows) rows = frappe.parse_json(list_view_settings.rows)
is_default = False is_default = False
elif not custom_view or is_default: elif not custom_view or is_default:
list = get_controller(doctype) _list = get_controller(doctype)
if hasattr(list, "default_list_data"): if hasattr(_list, "default_list_data"):
columns = list.default_list_data().get("columns") columns = _list.default_list_data().get("columns")
rows = list.default_list_data().get("rows") rows = _list.default_list_data().get("rows")
# check if rows has all keys from columns if not add them # check if rows has all keys from columns if not add them
for column in columns: for column in columns:

View File

@ -108,12 +108,20 @@ const options = createResource({
doctype: props.doctype, doctype: props.doctype,
}, },
transform: (data) => { transform: (data) => {
return data.map((option) => { let allData = data.map((option) => {
return { return {
label: option.value, label: option.value,
value: option.value, value: option.value,
} }
}) })
if (props.doctype == 'User') {
allData.unshift({
label: '@me',
value: '@me',
})
}
return allData
}, },
}) })