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

[fixes] minor: email_alert, listview, doctype validation

Browse source
This commit is contained in:
Rushabh Mehta 2014-10-07 10:40:32 +05:30
parent abb6efc3a0
commit f699c2d135
3 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
frappe/core/doctype/doctype/doctype.py
View file

@ -243,7 +243,7 @@ def validate_fields(meta):
if fold_exists:
frappe.throw(_("There can be only one Fold in a form"))
fold_exists = True
if i < len(fields)-1:
if i < len(fields)-2:
nxt = fields[i+1]
if nxt.fieldtype != "Section Break" \
or (nxt.fieldtype=="Section Break" and not nxt.label):

3
frappe/public/js/frappe/views/listview.js
View file

@ -85,6 +85,9 @@ frappe.views.ListView = Class.extend({
// additional fields
if(this.settings.add_fields) {
$.each(this.settings.add_fields, function(i, d) {
if(d.indexOf("`tab")===-1) {
d = "`tab" + me.doctype + "`." + d;
}
if(me.fields.indexOf(d)==-1)
me.fields.push(d);
});

1
frappe/utils/jinja.py
View file

@ -24,6 +24,7 @@ def get_template(path):
return get_jenv().get_template(path)
def render_template(template, context):
context.update(get_allowed_functions_for_jenv())
template = Template(template)
return template.render(**context)