[minor] abs url #1247, fix for form message
This commit is contained in:
parent
78b390eb47
commit
04ccac6df3
5 changed files with 12 additions and 16 deletions
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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:
|
||||
|
|
|
|||
|
|
@ -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)) {
|
||||
$('<div class="empty-form-alert text-muted" style="padding: 15px;">'
|
||||
+__("This form does not have any input")+'</div>')
|
||||
.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)) {
|
||||
$('<div class="empty-form-alert text-muted" style="padding: 15px;">'
|
||||
+__("This form does not have any input")+'</div>')
|
||||
.appendTo(this.page);
|
||||
}
|
||||
},
|
||||
attach_doc_and_docfields: function(refresh) {
|
||||
var me = this;
|
||||
for(var i=0, l=this.fields_list.length; i<l; i++) {
|
||||
|
|
|
|||
|
|
@ -62,7 +62,7 @@ frappe.get_gravatar = function(email_id) {
|
|||
frappe.ui.set_user_background = function(src, selector, style) {
|
||||
if(!selector) selector = "#page-desktop";
|
||||
if(!style) style = "Fill Screen";
|
||||
if(!src) src = frappe.boot.default_background_image;
|
||||
if(!src) src = frappe.urllib.get_full_url(frappe.boot.default_background_image);
|
||||
|
||||
frappe.dom.set_style(repl('%(selector)s { \
|
||||
background: url("%(src)s") center center;\
|
||||
|
|
|
|||
|
|
@ -447,13 +447,13 @@ _f.Frm.prototype.render_form = function(is_a_different_doc) {
|
|||
first.focus();
|
||||
}
|
||||
}
|
||||
|
||||
} else {
|
||||
this.refresh_header(is_a_different_doc);
|
||||
}
|
||||
|
||||
$(cur_frm.wrapper).trigger('render_complete');
|
||||
|
||||
this.layout.show_empty_form_message();
|
||||
}
|
||||
|
||||
_f.Frm.prototype.refresh_field = function(fname) {
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue