summaryrefslogtreecommitdiff
path: root/ishtar/ishtar_base/models.py
diff options
context:
space:
mode:
authorÉtienne Loks <etienne.loks@peacefrogs.net>2011-06-30 00:52:50 +0200
committerÉtienne Loks <etienne.loks@peacefrogs.net>2011-06-30 00:52:50 +0200
commitb5a6644e1ff8a84bab082a0d18cffa321750a97b (patch)
tree3115a748d06a6dc40dd9aff3b3e59c3fb197108a /ishtar/ishtar_base/models.py
parent9dfbab8d2ac9bc68c703706eaa360657d17d4fb5 (diff)
downloadIshtar-b5a6644e1ff8a84bab082a0d18cffa321750a97b.tar.bz2
Ishtar-b5a6644e1ff8a84bab082a0d18cffa321750a97b.zip
Sources creation modification and deletion for context records and archaelogical items (closes #497)
Diffstat (limited to 'ishtar/ishtar_base/models.py')
-rw-r--r--ishtar/ishtar_base/models.py7
1 files changed, 6 insertions, 1 deletions
diff --git a/ishtar/ishtar_base/models.py b/ishtar/ishtar_base/models.py
index 8ae0af0f1..0f3cb8a8b 100644
--- a/ishtar/ishtar_base/models.py
+++ b/ishtar/ishtar_base/models.py
@@ -144,6 +144,9 @@ class GeneralType(models.Model):
c_rank = -1
help_items = u"\n"
for item in cls.get_types(dct=dct, instances=True):
+ if hasattr(item, '__iter__'):
+ # TODO: manage multiple levels
+ continue
if not item.comment:
continue
if c_rank > item.rank:
@@ -156,7 +159,9 @@ class GeneralType(models.Model):
c_rank += 1
if c_rank:
help_items += c_rank*u"</dl>"
- return mark_safe(help_text + help_items)
+ if help_text or help_items != u'\n':
+ return mark_safe(help_text + help_items)
+ return u""
@classmethod
def get_types(cls, dct={}, instances=False):