diff --git a/frappe/public/js/frappe/router.js b/frappe/public/js/frappe/router.js index 1b038b6265..39e6555654 100644 --- a/frappe/public/js/frappe/router.js +++ b/frappe/public/js/frappe/router.js @@ -59,10 +59,12 @@ $('body').on('click', 'a', function(e) { if (frappe.router.is_app_route(e.currentTarget.pathname)) { // target has "/app, this is a v2 style route. - frappe.route_options = {}; - let params = new URLSearchParams(e.currentTarget.search); - for (const [key, value] of params) { - frappe.route_options[key] = value; + if (e.currentTarget.search) { + frappe.route_options = {}; + let params = new URLSearchParams(e.currentTarget.search); + for (const [key, value] of params) { + frappe.route_options[key] = value; + } } return override(e.currentTarget.pathname + e.currentTarget.hash); } diff --git a/frappe/public/js/frappe/widgets/quick_list_widget.js b/frappe/public/js/frappe/widgets/quick_list_widget.js index ce81333147..3156c1440e 100644 --- a/frappe/public/js/frappe/widgets/quick_list_widget.js +++ b/frappe/public/js/frappe/widgets/quick_list_widget.js @@ -104,6 +104,7 @@ export default class QuickListWidget extends Widget { if (old_filter != me.quick_list_filter) { me.body.empty(); + me.set_footer(); me.set_body(); } }, @@ -191,6 +192,10 @@ export default class QuickListWidget extends Widget { if (this.has_status_field) { fields.push('status'); fields.push('docstatus'); + + // add workflow state field if workflow exist & is active + let workflow_fieldname = frappe.workflow.get_state_fieldname(this.document_type); + workflow_fieldname && fields.push(workflow_fieldname); } fields.push('modified'); @@ -230,18 +235,18 @@ export default class QuickListWidget extends Widget { } set_footer() { - if (!this.see_all_button) { - this.see_all_button = $(` -