vassili/seitime-frappe
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 4

Fixed enable scheduler patch, control.js disp_area fix

Browse source
This commit is contained in:
Anand Doshi 2014-06-04 20:50:26 +05:30
parent 21250ee32e
commit 8dd14aa6c1
2 changed files with 15 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
frappe/patches/v4_0/enable_scheduler_in_system_settings.py
View file

@ -6,6 +6,7 @@ import frappe
from frappe.utils.scheduler import disable_scheduler, enable_scheduler
def execute():
frappe.reload_doc("core", "doctype", "system_settings")
if frappe.db.get_global("disable_scheduler"):
disable_scheduler()
else:

21
frappe/public/js/frappe/form/control.js
View file

@ -193,12 +193,10 @@ frappe.ui.form.ControlInput = frappe.ui.form.Control.extend({
} else {
$(me.input_area).toggle(false);
$(me.input_area).find("input").prop("disabled", true);
me.disp_area && $(me.disp_area)
.toggle(true)
.html(
frappe.format(me.value, me.df,
{no_icon:true}, me.name ? locals[me.doctype][me.name] : null)
);
if (me.disp_area) {
me.set_disp_area();
$(me.disp_area).toggle(true);
}
}
me.set_description();
@ -208,6 +206,15 @@ frappe.ui.form.ControlInput = frappe.ui.form.Control.extend({
return false;
});
},
set_disp_area: function() {
this.disp_area && $(this.disp_area)
.html(
frappe.format(this.value, this.df,
{no_icon:true}, this.name ? locals[this.doctype][this.name] : null)
);
},
bind_change_event: function() {
var me = this;
this.$input && this.$input.on("change", this.change || function(e) {
@ -289,7 +296,7 @@ frappe.ui.form.ControlData = frappe.ui.form.ControlInput.extend({
},
set_input: function(val) {
this.$input && this.$input.val(this.format_for_input(val));
this.disp_area && $(this.disp_area).html(this.format_for_input(val));
this.set_disp_area();
this.last_value = val;
this.set_mandatory && this.set_mandatory(val);
},