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

Fixes in delete doc and field group

Browse source
This commit is contained in:
Anand Doshi 2014-04-28 20:32:21 +05:30
parent 1b0c74a93c
commit 844bc166d1
2 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
frappe/model/delete_doc.py
View file

@ -62,7 +62,7 @@ def delete_doc(doctype=None, name=None, force=0, ignore_doctypes=None, for_reloa
def check_permission_and_not_submitted(doc, ignore_permissions=False):
# permission
if not ignore_permissions and frappe.session.user!="Administrator" and not doc.has_permission("cancel"):
if not ignore_permissions and frappe.session.user!="Administrator" and not doc.has_permission("delete"):
frappe.msgprint(_("User not allowed to delete."), raise_exception=True)
# check if submitted

9
frappe/public/js/frappe/ui/field_group.js
View file

@ -33,9 +33,10 @@ frappe.ui.FieldGroup = frappe.ui.form.Layout.extend({
var me = this;
$(this.body).find('input[type="text"], input[type="password"]').keypress(function(e) {
if(e.which==13) {
e.preventDefault();
$(me.body).find('.btn-primary:first').click();
}
})
});
},
get_input: function(fieldname) {
var field = this.fields_dict[fieldname];
@ -49,7 +50,7 @@ frappe.ui.FieldGroup = frappe.ui.form.Layout.extend({
if(f.get_parsed_value) {
var v = f.get_parsed_value();
if(f.df.reqd && !v)
if(f.df.reqd && !v)
errors.push('- ' + __(f.df.label) + "<br>");
if(v) ret[f.df.fieldname] = v;
@ -74,7 +75,7 @@ frappe.ui.FieldGroup = frappe.ui.form.Layout.extend({
f.set_input(val);
}
},
set_values: function(dict) {
set_values: function(dict) {
for(var key in dict) {
if(this.fields_dict[key]) {
this.set_value(key, dict[key]);
@ -85,7 +86,7 @@ frappe.ui.FieldGroup = frappe.ui.form.Layout.extend({
for(key in this.fields_dict) {
var f = this.fields_dict[key];
if(f) {
f.set_input(f.df['default'] || '');
f.set_input(f.df['default'] || '');
}
}
},