🐛 QA forms: fix confirm messages for operation and archaeological sites

2 files changed, 15 insertions, 1 deletions

diff --git a/archaeological_operations/forms.py b/archaeological_operations/forms.py
index 939a87de9..a5c9d5b1b 100644
--- a/archaeological_operations/forms.py
+++ b/archaeological_operations/forms.py
@@ -1764,6 +1764,9 @@ class QAOperationFormMulti(QAForm):
     def _get_qa_operator(self, value):
         return self._get_organization(value)
 
+    def _get_qa_collaborators(self, value):
+        return self._get_person(value)
+
     def _get_qa_finds_received(self, value):
         return self._get_null_boolean_field(value)
 
@@ -1879,7 +1882,8 @@ class QAArchaeologicalSiteFormMulti(QAForm):
     qa_collaborators = forms.IntegerField(
         label=_("Collaborators"), required=False,
         widget=widgets.JQueryAutoComplete(
-            reverse_lazy('autocomplete-person')
+            reverse_lazy('autocomplete-person'),
+            associated_model=Person, new=True
         ),
     )
     qa_cultural_attributions = forms.ChoiceField(
@@ -1898,6 +1902,9 @@ class QAArchaeologicalSiteFormMulti(QAForm):
         FieldType('qa_remains', models.RemainType),
     ]
 
+    def _get_qa_collaborators(self, value):
+        return self._get_person(value)
+
     def _get_qa_towns(self, value):
         try:
             value = Town.objects.get(pk=value).cached_label
diff --git a/ishtar_common/forms.py b/ishtar_common/forms.py
index 6a18102df..086f85b90 100644
--- a/ishtar_common/forms.py
+++ b/ishtar_common/forms.py
@@ -1413,6 +1413,13 @@ class QAForm(CustomForm, ManageOldType):
             return ""
         return value
 
+    def _get_person(self, value):
+        try:
+            value = models.Person.objects.get(pk=value).cached_label
+        except models.Person.DoesNotExist:
+            return ""
+        return value
+
     def save(self, items, user):
         if not items or not user.ishtaruser:
             return