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

fix: send default_filter separately

Browse Source
This commit is contained in:
Shariq Ansari 2024-01-07 13:59:01 +05:30
parent 7b3dd34b7b
commit e3c95f63cf
2 changed files with 19 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
crm/api/doc.py
View File

@ -56,9 +56,22 @@ def get_filterable_fields(doctype: str):
@frappe.whitelist()
def get_list_data(doctype: str, filters: dict, order_by: str, columns=None , rows=None, custom_view_name=None):
def get_list_data(
doctype: str,
filters: dict,
order_by: str,
columns=None,
rows=None,
custom_view_name=None,
default_filters=None,
):
custom_view = False
filters = frappe._dict(filters)
if default_filters:
default_filters = frappe.parse_json(default_filters)
filters.update(default_filters)
is_default = True
if columns or rows:
custom_view = True

8
frontend/src/components/ViewControls.vue
View File

@ -116,7 +116,7 @@ const currentView = computed(() => {
const view = ref({
name: '',
label: '',
filters: props.filters,
filters: {},
order_by: 'modified desc',
columns: '',
rows: '',
@ -126,7 +126,7 @@ const view = ref({
function getParams() {
let _view = getView(route.query.view)
const filters = (_view?.filters && JSON.parse(_view.filters)) || props.filters
const filters = (_view?.filters && JSON.parse(_view.filters)) || {}
const order_by = _view?.order_by || 'modified desc'
const columns = _view?.columns || ''
const rows = _view?.rows || ''
@ -147,7 +147,7 @@ function getParams() {
view.value = {
name: '',
label: '',
filters: props.filters,
filters: {},
order_by: 'modified desc',
columns: '',
rows: '',
@ -164,6 +164,7 @@ function getParams() {
columns: columns,
rows: rows,
custom_view_name: _view?.name || '',
default_filters: props.filters,
}
}
@ -181,6 +182,7 @@ list.value = createResource({
columns: data.columns,
rows: data.rows,
custom_view_name: cv?.name || '',
default_filters: props.filters,
}
},
})