diff --git a/frappe/public/js/frappe/list/base_list.js b/frappe/public/js/frappe/list/base_list.js index c2c9903355..19ffb6098c 100644 --- a/frappe/public/js/frappe/list/base_list.js +++ b/frappe/public/js/frappe/list/base_list.js @@ -154,7 +154,7 @@ frappe.views.BaseList = class BaseList { this.page = this.parent.page; this.$page = $(this.parent); !this.hide_card_layout && this.page.main.addClass('frappe-card'); - this.page.page_form.removeClass("row").addClass("flex justify-between"); + this.page.page_form.removeClass("row").addClass("flex"); this.hide_page_form && this.page.page_form.hide(); this.hide_sidebar && this.$page.addClass('no-list-sidebar'); this.setup_page_head(); @@ -183,7 +183,7 @@ frappe.views.BaseList = class BaseList { } if (frappe.boot.desk_settings.view_switcher) { - this.views_menu = this.page.add_custom_button_group(__('{0} View', [this.view_name]), + this.views_menu = this.page.add_custom_button_group(__('{0} View', [this.view_name]), icon_map[this.view_name] || 'list'); this.views_list = new frappe.views.ListViewSelect({ doctype: this.doctype, diff --git a/frappe/public/js/frappe/views/reports/query_report.js b/frappe/public/js/frappe/views/reports/query_report.js index 80d0aa71da..20a292eece 100644 --- a/frappe/public/js/frappe/views/reports/query_report.js +++ b/frappe/public/js/frappe/views/reports/query_report.js @@ -465,8 +465,7 @@ frappe.views.QueryReport = class QueryReport extends frappe.views.BaseList { this.clear_filters(); const { filters = [] } = this.report_settings; - let filter_area = $(`
`); - this.page.page_form.append(filter_area); + let filter_area = this.page.page_form;s this.filters = filters.map(df => { if (df.fieldtype === 'Break') return; @@ -806,7 +805,7 @@ frappe.views.QueryReport = class QueryReport extends frappe.views.BaseList { const data = r.message; // Rememeber the name of Prepared Report doc this.prepared_report_doc_name = data.name; - let alert_message = `` + + let alert_message = `` + __('Report initiated, click to view status') + ``; frappe.show_alert({message: alert_message, indicator: 'orange'}, 10); this.toggle_nothing_to_show(true);