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

double column fix

Browse source
This commit is contained in:
Rushabh Mehta 2012-05-01 17:11:42 +05:30
parent 3e2a74f2a5
commit 87545f035f
3 changed files with 14 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
js/core.min.js vendored
View file

@ -73,7 +73,8 @@ wn.provide('wn.model');wn.model={no_value_type:['Section Break','Column Break','
* lib/js/wn/meta.js
*/
wn.provide('wn.meta.docfield_map');wn.provide('wn.meta.docfield_list');wn.provide('wn.meta.doctypes');$.extend(wn.meta,{add_field:function(df){wn.provide('wn.meta.docfield_map.'+df.parent);wn.meta.docfield_map[df.parent][df.fieldname||df.label]=df;if(!wn.meta.docfield_list[df.parent])
wn.meta.docfield_list[df.parent]=[]
wn.meta.docfield_list[df.parent]=[];for(var i in wn.meta.docfield_list[df.parent]){var d=wn.meta.docfield_list[df.parent][i];if(df.fieldname==d.fieldname)
return;}
wn.meta.docfield_list[df.parent].push(df);}});
/*
* lib/js/wn/misc/tools.js

9
js/wn/meta.js
View file

@ -31,7 +31,14 @@ $.extend(wn.meta, {
wn.meta.docfield_map[df.parent][df.fieldname || df.label] = df;
if(!wn.meta.docfield_list[df.parent])
wn.meta.docfield_list[df.parent] = []
wn.meta.docfield_list[df.parent] = [];
// check for repeat
for(var i in wn.meta.docfield_list[df.parent]) {
var d = wn.meta.docfield_list[df.parent][i];
if(df.fieldname==d.fieldname)
return; // no repeat
}
wn.meta.docfield_list[df.parent].push(df);
}
});

5
py/core/doctype/doctype/doctype.py
View file

@ -87,7 +87,10 @@ class DocType:
for c in illegal:
if c in d.fieldname:
webnotes.msgprint('"%s" not allowed in fieldname' % c)
else:
webnotes.msgprint("Fieldname is mandatory in row %s" % str(d.idx+1), raise_exception=1)
# check illegal mandatory
if d.fieldtype in ('HTML', 'Button', 'Section Break', 'Column Break') and d.reqd:
webnotes.msgprint('%(lable)s [%(fieldtype)s] cannot be mandatory', raise_exception=1)