diff options
| author | Étienne Loks <etienne.loks@proxience.com> | 2015-10-06 14:49:10 +0200 |
|---|---|---|
| committer | Étienne Loks <etienne.loks@proxience.com> | 2015-10-06 14:49:10 +0200 |
| commit | dad03f626f1028daa44821a7d88551fec21ae88f (patch) | |
| tree | 7db35133da25a55cfe1183260953aab882255309 /archaeological_operations | |
| parent | 4b1349b748e8dbd1ace541cc55562dba6bd9fe6f (diff) | |
| download | Ishtar-dad03f626f1028daa44821a7d88551fec21ae88f.tar.bz2 Ishtar-dad03f626f1028daa44821a7d88551fec21ae88f.zip | |
Grids: manage multiple values in the same column
Diffstat (limited to 'archaeological_operations')
| -rw-r--r-- | archaeological_operations/models.py | 2 | ||||
| -rw-r--r-- | archaeological_operations/templates/ishtar/sheet_operation.html | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/archaeological_operations/models.py b/archaeological_operations/models.py index 90af1bd62..e5c22c909 100644 --- a/archaeological_operations/models.py +++ b/archaeological_operations/models.py @@ -320,7 +320,7 @@ class Operation(BaseHistorizedItem, OwnPerms, ValueGetter, ShortMenuItem, def get_reference(self, full=False): ref = "" - if self.code_patriarche: + if settings.COUNTRY == 'fr' and self.code_patriarche: ref = "OA" + unicode(self.code_patriarche) if not full: return ref diff --git a/archaeological_operations/templates/ishtar/sheet_operation.html b/archaeological_operations/templates/ishtar/sheet_operation.html index 9d22657c3..56b5115d6 100644 --- a/archaeological_operations/templates/ishtar/sheet_operation.html +++ b/archaeological_operations/templates/ishtar/sheet_operation.html @@ -108,7 +108,7 @@ {% trans "Finds" as finds %} {% if item.finds %} -{% dynamic_table_document finds 'finds' 'base_finds__context_record__operation' item.pk %} +{% dynamic_table_document finds 'finds_for_ope' 'base_finds__context_record__operation' item.pk 'TABLE_COLS_FOR_OPE' %} {% endif %} {% comment %} |