Merge branch 'master' of git://github.com/rmehta/wnframework

This commit is contained in:
nabinhait 2011-07-01 15:17:32 +05:30
commit 03fa68da5b
2 changed files with 2 additions and 1 deletions

1
.gitignore vendored
View file

@ -1,3 +1,4 @@
*.pyc
*.comp.js
*.DS_Store
defs.py

View file

@ -140,7 +140,7 @@ class _DocType:
fields = {}
for d in doclist:
if d['doctype']=='DocField':
if d['fieldname'] or d['label']:
if d.get('fieldname') or d.get('label'):
fields[d['fieldname'] or d['label']] = d
return fields