diff options
| author | Étienne Loks <etienne.loks@iggdrasil.net> | 2017-07-12 12:52:04 +0200 |
|---|---|---|
| committer | Étienne Loks <etienne.loks@iggdrasil.net> | 2017-07-12 12:52:04 +0200 |
| commit | 3155a3fefe1fbebf38053cde143ae666e263fa4b (patch) | |
| tree | 9f28e2654022c6d827e2d56607665675b7fd0ffa /ishtar_common | |
| parent | 21dc7d456a113fe897c828c30884f3d0cc2b99c3 (diff) | |
| parent | 4aa6e59b2968e14e9f111fa4f3fceb874c91ca4b (diff) | |
| download | Ishtar-3155a3fefe1fbebf38053cde143ae666e263fa4b.tar.bz2 Ishtar-3155a3fefe1fbebf38053cde143ae666e263fa4b.zip | |
Merge branch 'v0.9' into wheezy
Diffstat (limited to 'ishtar_common')
| -rw-r--r-- | ishtar_common/models.py | 2 | ||||
| -rw-r--r-- | ishtar_common/views.py | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/ishtar_common/models.py b/ishtar_common/models.py index 639e44af3..5c84447a4 100644 --- a/ishtar_common/models.py +++ b/ishtar_common/models.py @@ -2220,6 +2220,8 @@ TARGET_MODELS = [ ('archaeological_context_records.models.Unit', _(u"Unit")), ('archaeological_context_records.models.ActivityType', _(u"Activity type")), + ('archaeological_context_records.models.DocumentationType', + _(u"Documentation type")), ('archaeological_finds.models.MaterialType', _(u"Material")), ('archaeological_finds.models.ConservatoryState', _(u"Conservatory state")), diff --git a/ishtar_common/views.py b/ishtar_common/views.py index 0be382866..5786391cc 100644 --- a/ishtar_common/views.py +++ b/ishtar_common/views.py @@ -1153,7 +1153,7 @@ def get_item(model, func_name, default_name, extra_request_keys=[], for idx, col_name in enumerate(table_cols): val = data[1:][idx + delta].encode( ENCODING, errors='replace') - if "|" in col_name[0]: + if col_name and "|" in col_name[0]: for delta_idx in range(len(col_name[0].split('|')) - 1): delta += 1 val += data[1:][idx + delta].encode( |