diff options
| -rw-r--r-- | archaeological_files/models.py | 4 | ||||
| -rw-r--r-- | archaeological_operations/models.py | 4 | ||||
| -rw-r--r-- | ishtar_common/models.py | 1 | ||||
| -rw-r--r-- | ishtar_common/templates/ishtar/sheet_person.html | 12 | 
4 files changed, 14 insertions, 7 deletions
| diff --git a/archaeological_files/models.py b/archaeological_files/models.py index 3a397e551..4d0422f3c 100644 --- a/archaeological_files/models.py +++ b/archaeological_files/models.py @@ -110,6 +110,10 @@ class File(ClosedItem, BaseHistorizedItem, OwnPerms, ValueGetter,          'history_creator': 'history_creator__ishtaruser__person__pk',          'history_modifier': 'history_modifier__ishtaruser__person__pk',          'towns_label': 'towns', +        'general_contractor__pk': 'general_contractor__pk', +        'responsible_town_planning_service__pk': +            'responsible_town_planning_service__pk', +        'in_charge__pk': 'in_charge__pk',      }      BASE_SEARCH_VECTORS = [          'name', 'internal_reference', 'file_type__label', 'saisine_type__label', diff --git a/archaeological_operations/models.py b/archaeological_operations/models.py index 2218c1b6f..3be4dd95d 100644 --- a/archaeological_operations/models.py +++ b/archaeological_operations/models.py @@ -421,7 +421,9 @@ class Operation(ClosedItem, BaseHistorizedItem, OwnPerms, ValueGetter,          'finds_deadline_after': 'finds_deadline__gte',          'related_treatment':          'context_record__base_finds__find__upstream_treatment__id', -        'towns_label': 'towns' +        'towns_label': 'towns', +        'scientist__pk': 'scientist__pk', +        'in_charge__pk': 'in_charge__pk',      }      COL_LABELS = { diff --git a/ishtar_common/models.py b/ishtar_common/models.py index 2f637cabe..8c150bf29 100644 --- a/ishtar_common/models.py +++ b/ishtar_common/models.py @@ -3405,6 +3405,7 @@ class Document(OwnPerms, ImageModel, FullSearch, Imported):          "finds__base_finds__context_record__operation":              "finds__base_finds__context_record__operation__pk",          'authors__cached_label': 'authors__cached_label', +        'authors__person__pk': 'authors__person__pk',      }      # alternative names of fields for searches diff --git a/ishtar_common/templates/ishtar/sheet_person.html b/ishtar_common/templates/ishtar/sheet_person.html index f84b80d83..ef8bb9064 100644 --- a/ishtar_common/templates/ishtar/sheet_person.html +++ b/ishtar_common/templates/ishtar/sheet_person.html @@ -81,31 +81,31 @@  {% trans "Associated operations as scientist" as ao %}  {% if item.operation_scientist_responsability.count %} -{% dynamic_table_document ao 'operations' 'scientist' item.pk '' output %} +{% dynamic_table_document ao 'operations' 'scientist__pk' item.pk '' output %}  {% endif %}  {% trans "Associated operations as responsible" as ao %}  {% if item.operation_responsability.count %} -{% dynamic_table_document ao 'operations' 'in_charge' item.pk '' output %} +{% dynamic_table_document ao 'operations' 'in_charge__pk' item.pk '' output %}  {% endif %}  {% trans "In charge of archaeological files" as af %}  {% if item.file_responsability.count %} -{% dynamic_table_document af 'files' 'in_charge' item.pk '' output %} +{% dynamic_table_document af 'files' 'in_charge__pk' item.pk '' output %}  {% endif %}  {% trans "General contractor of archaeological files" as af %}  {% if item.general_contractor_files.count %} -{% dynamic_table_document af 'files' 'general_contractor' item.pk '' output %} +{% dynamic_table_document af 'files' 'general_contractor__pk' item.pk '' output %}  {% endif %}  {% trans "Responsible for planning service of archaeological files" as af %}  {% if item.responsible_town_planning_service_files.count %} -{% dynamic_table_document af 'files' 'responsible_town_planning_service' item.pk '' output %} +{% dynamic_table_document af 'files' 'responsible_town_planning_service__pk' item.pk '' output %}  {% endif %}  {% if item.docs_q.count %}  {% trans "Documents" as docs %} -{% dynamic_table_document docs 'documents' 'authors__person' item.pk '' output %} +{% dynamic_table_document docs 'documents' 'authors__person__pk' item.pk '' output %}  {% endif %} | 
