diff options
| author | Étienne Loks <etienne.loks@proxience.com> | 2015-02-16 04:24:05 +0100 |
|---|---|---|
| committer | Étienne Loks <etienne.loks@proxience.com> | 2015-05-06 15:48:16 +0200 |
| commit | 122742da86101e607749a0ad477dd0a70168f674 (patch) | |
| tree | 7305448c5f1917ee966f58a97ecb90d442fe5413 /archaeological_files | |
| parent | 0c00240278777e21c9c280d40ab23c083d935402 (diff) | |
| download | Ishtar-122742da86101e607749a0ad477dd0a70168f674.tar.bz2 Ishtar-122742da86101e607749a0ad477dd0a70168f674.zip | |
Modify short label of archaeological files and operations (refs #2285)
Diffstat (limited to 'archaeological_files')
| -rw-r--r-- | archaeological_files/models.py | 2 | ||||
| -rw-r--r-- | archaeological_files/templates/ishtar/sheet_file.html | 6 |
2 files changed, 3 insertions, 5 deletions
diff --git a/archaeological_files/models.py b/archaeological_files/models.py index 5f402b9f1..a5f2c6c41 100644 --- a/archaeological_files/models.py +++ b/archaeological_files/models.py @@ -262,7 +262,7 @@ class File(BaseHistorizedItem, OwnPerms, ValueGetter, ShortMenuItem, @property def reference(self): - return u"-".join((unicode(self.year), + return settings.FILE_PREFIX+u"-".join((unicode(self.year), unicode(self.numeric_reference or '0'))) def _generate_cached_label(self): diff --git a/archaeological_files/templates/ishtar/sheet_file.html b/archaeological_files/templates/ishtar/sheet_file.html index 736f982c5..2d7b6262d 100644 --- a/archaeological_files/templates/ishtar/sheet_file.html +++ b/archaeological_files/templates/ishtar/sheet_file.html @@ -102,7 +102,6 @@ <table> <caption>{%trans "Associated operations"%}</caption> <tr> - <th>{% trans "Year" %}</th> <th>{% trans "Ref." %}</th> <th>Code Patriarche</th> <th>{% trans "Type" %}</th> @@ -113,9 +112,8 @@ </tr> {% for operation in item.operations.all %} <tr> - <td>{{operation.year}}</td> - <td>{{operation.operation_code}}</td> - <td>{{operation.code_patriarche|default:""}}</td> + <td>{{operation.year_index}}</td> + <td>{{operation.full_code_patriarche|default:""}}</td> <td class='string'>{{operation.operation_type}}</td> <td class='string'>{{operation.in_charge|default:""}}</td> <td>{{operation.start_date|default:""}}</td> |