Explorar el Código

[text-editor] dont keep refreshing value and better message for mandatory missing

version-14
Rushabh Mehta hace 8 años
padre
commit
1b3fab9daf
Se han modificado 2 ficheros con 2 adiciones y 3 borrados
  1. +1
    -2
      frappe/model/base_document.py
  2. +1
    -1
      frappe/public/js/frappe/form/control.js

+ 1
- 2
frappe/model/base_document.py Ver fichero

@@ -423,12 +423,11 @@ class BaseDocument(object):
return "{}: {}: {}".format(_("Error"), _("Data missing in table"), _(df.label)) return "{}: {}: {}".format(_("Error"), _("Data missing in table"), _(df.label))


elif self.parentfield: elif self.parentfield:

return "{}: {} {} #{}: {}: {}".format(_("Error"), frappe.bold(_(self.doctype)), return "{}: {} {} #{}: {}: {}".format(_("Error"), frappe.bold(_(self.doctype)),
_("Row"), self.idx, _("Value missing for"), _(df.label)) _("Row"), self.idx, _("Value missing for"), _(df.label))


else: else:
return "{}: {}: {}".format(_("Error"), _("Value missing for"), _(df.label))
return _("Error: Value missing for {0}: {1}").format(_(df.parent), _(df.label))


missing = [] missing = []




+ 1
- 1
frappe/public/js/frappe/form/control.js Ver fichero

@@ -1761,10 +1761,10 @@ frappe.ui.form.ControlTextEditor = frappe.ui.form.ControlCode.extend({
}); });
}, },
onChange: function(value) { onChange: function(value) {
me._last_change_on = new Date();
me.parse_validate_and_set_in_model(value); me.parse_validate_and_set_in_model(value);
}, },
onKeydown: function(e) { onKeydown: function(e) {
this._last_change_on = new Date();
var key = frappe.ui.keys.get_key(e); var key = frappe.ui.keys.get_key(e);
// prevent 'New DocType (Ctrl + B)' shortcut in editor // prevent 'New DocType (Ctrl + B)' shortcut in editor
if(['ctrl+b', 'meta+b'].indexOf(key) !== -1) { if(['ctrl+b', 'meta+b'].indexOf(key) !== -1) {


Cargando…
Cancelar
Guardar