diff options
| author | Emma <emma@iggdrasil.net> | 2021-10-27 15:12:06 +0200 |
|---|---|---|
| committer | Emma <emma@iggdrasil.net> | 2021-10-27 15:12:06 +0200 |
| commit | f156a4cb2331f8d3de30055fe4d464c0015c0772 (patch) | |
| tree | c0eb382ab66f7667f4464dab54adb37c40c09922 | |
| parent | aba002b297a066d725ab75367ec5533dcafe16a9 (diff) | |
| download | Ishtar-WIP/emma.tar.bz2 Ishtar-WIP/emma.zip | |
Operation vocabulary clarificationWIP/emma
| -rw-r--r-- | archaeological_operations/models.py | 6 | ||||
| -rw-r--r-- | ishtar_common/templates/ishtar/sheet_person.html | 2 | ||||
| -rw-r--r-- | ishtar_common/templates/ishtar/wizard/wizard_person_deletion.html | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/archaeological_operations/models.py b/archaeological_operations/models.py index 277ca76d3..d12f8ee22 100644 --- a/archaeological_operations/models.py +++ b/archaeological_operations/models.py @@ -1134,7 +1134,7 @@ class Operation( Person, blank=True, null=True, - verbose_name=_("In charge scientist"), + verbose_name=_("Scientific manager"), on_delete=models.SET_NULL, related_name="operation_scientist_responsability", ) @@ -1150,9 +1150,9 @@ class Operation( Person, blank=True, null=True, - verbose_name=_("In charge"), + verbose_name=_("Operation monitor"), on_delete=models.SET_NULL, - related_name="operation_responsability", + related_name="operation_monitoring", ) collaborators = models.ManyToManyField( Person, diff --git a/ishtar_common/templates/ishtar/sheet_person.html b/ishtar_common/templates/ishtar/sheet_person.html index 170d088ee..46639f248 100644 --- a/ishtar_common/templates/ishtar/sheet_person.html +++ b/ishtar_common/templates/ishtar/sheet_person.html @@ -86,7 +86,7 @@ {% endif %} {% trans "Associated operations as responsible" as ao %} -{% if item.operation_responsability.count %} +{% if item.operation_monitoring.count %} {% dynamic_table_document ao 'operations' 'in_charge__pk' item.pk '' output %} {% endif %} diff --git a/ishtar_common/templates/ishtar/wizard/wizard_person_deletion.html b/ishtar_common/templates/ishtar/wizard/wizard_person_deletion.html index d078aeba3..a58426bdb 100644 --- a/ishtar_common/templates/ishtar/wizard/wizard_person_deletion.html +++ b/ishtar_common/templates/ishtar/wizard/wizard_person_deletion.html @@ -47,10 +47,10 @@ </ul> {% endif %} -{% if current_object.operation_responsability.count %} +{% if current_object.operation_monitoring.count %} <h3>{% trans "In charge of archaeological operations" %}</h3> <ul class='list'> -{% for operation in current_object.operation_responsability.all %} +{% for operation in current_object.operation_monitoring.all %} <li>{{operation}} <a class='display_details_inline' href="#" onclick='load_window("{% url "show-operation" operation.pk "" %}")'><i class="fa fa-info-circle" aria-hidden="true"></i></a></li>{% endfor %} </ul> |