Browse Source

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

version-14
Rushabh Mehta 8 years ago
parent
commit
1b3fab9daf
2 changed files with 2 additions and 3 deletions
  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 View File

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

elif self.parentfield:

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

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

missing = []



+ 1
- 1
frappe/public/js/frappe/form/control.js View File

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


Loading…
Cancel
Save