diff --git a/frappe/boot.py b/frappe/boot.py index 78a498801d..20d5b2f0bf 100644 --- a/frappe/boot.py +++ b/frappe/boot.py @@ -69,7 +69,7 @@ def get_bootinfo(): bootinfo['versions'] = {k: v['version'] for k, v in get_versions().items()} bootinfo.error_report_email = frappe.get_hooks("error_report_email") - bootinfo.default_background_image = get_url("/assets/frappe/images/ui/into-the-dawn.jpg") + bootinfo.default_background_image = "/assets/frappe/images/ui/into-the-dawn.jpg" bootinfo.calendars = sorted(frappe.get_hooks("calendars")) return bootinfo diff --git a/frappe/commands.py b/frappe/commands.py index c58be53b20..f1fee3ae27 100644 --- a/frappe/commands.py +++ b/frappe/commands.py @@ -626,7 +626,7 @@ def run_tests(context, app=None, module=None, doctype=None, test=(), driver=None site = get_single_site(context) frappe.init(site=site) - if frappe.conf.run_selenium_tests: + if frappe.conf.run_selenium_tests and False: sel.start(context.verbose, driver) try: diff --git a/frappe/public/js/frappe/form/layout.js b/frappe/public/js/frappe/form/layout.js index 3dce0ebd2c..85812be228 100644 --- a/frappe/public/js/frappe/form/layout.js +++ b/frappe/public/js/frappe/form/layout.js @@ -44,24 +44,20 @@ frappe.ui.form.Layout = Class.extend({ $(this.frm.wrapper).trigger("refresh-fields"); } - if (this.frm) { - // show empty form notification - setTimeout(function() { - me.page.find(".empty-form-alert").remove(); - if(!(me.page.find(".frappe-control:visible").length)) { - $('
' - +__("This form does not have any input")+'
') - .appendTo(me.page); - } - }, 100); - } - // dependent fields this.refresh_dependency(); // refresh sections this.refresh_sections(); }, + show_empty_form_message: function() { + this.wrapper.find(".empty-form-alert").remove(); + if(!(this.wrapper.find(".frappe-control:visible").length)) { + $('
' + +__("This form does not have any input")+'
') + .appendTo(this.page); + } + }, attach_doc_and_docfields: function(refresh) { var me = this; for(var i=0, l=this.fields_list.length; i