From 61c60c5e52277dce0cb754cf955ef87a2966e1ca Mon Sep 17 00:00:00 2001 From: Anand Doshi Date: Wed, 20 Feb 2013 15:55:09 +0530 Subject: [PATCH] get label from doctype's doclist --- webnotes/model/doc.py | 11 ++++++++++- webnotes/model/meta.py | 10 ++++++---- 2 files changed, 16 insertions(+), 5 deletions(-) diff --git a/webnotes/model/doc.py b/webnotes/model/doc.py index 531be43105..1e3385fee7 100755 --- a/webnotes/model/doc.py +++ b/webnotes/model/doc.py @@ -111,8 +111,17 @@ class Document: def __str__(self): return str(self.fields) + def __repr__(self): + return repr(self.fields) + + def __unicode__(self): + return unicode(self.fields) + def __eq__(self, other): - return self.fields == other.fields + if isinstance(other, Document): + return self.fields == other.fields + else: + return False def __getstate__(self): return self.fields diff --git a/webnotes/model/meta.py b/webnotes/model/meta.py index 064eb15d22..b84fcc078f 100644 --- a/webnotes/model/meta.py +++ b/webnotes/model/meta.py @@ -72,7 +72,9 @@ def get_table_fields(doctype): return child_tables + custom_child_tables -def has_field(doctype, fieldname): - doclist = webnotes.model.doctype.get(doctype) - return doclist.get({"parent":doctype, "doctype":"DocField", "fieldname":fieldname}) - \ No newline at end of file +def has_field(doctype, fieldname, parent=None, parentfield=None): + return get_field(doctype, fieldname, parent=None, parentfield=None) and True or False + +def get_field(doctype, fieldname, parent=None, parentfield=None): + doclist = webnotes.get_doctype(doctype) + return doclist.get_field(fieldname, parent, parentfield) \ No newline at end of file