diff options
| -rw-r--r-- | archaeological_context_records/forms.py | 2 | ||||
| -rw-r--r-- | archaeological_context_records/tests.py | 48 |
2 files changed, 28 insertions, 22 deletions
diff --git a/archaeological_context_records/forms.py b/archaeological_context_records/forms.py index 9b2ae129c..0799991dd 100644 --- a/archaeological_context_records/forms.py +++ b/archaeological_context_records/forms.py @@ -754,7 +754,7 @@ class QAContextRecordFormMulti(QAForm): super(QAContextRecordFormMulti, self).__init__(*args, **kwargs) self.items = kwargs.pop("items") disable = False - if self.items > 1: + if len(self.items) > 1: op_pk = self.items[0].pk for cr in self.items[1:]: if op_pk != cr.operation.pk: diff --git a/archaeological_context_records/tests.py b/archaeological_context_records/tests.py index bef8a916a..0b1afe2e7 100644 --- a/archaeological_context_records/tests.py +++ b/archaeological_context_records/tests.py @@ -589,38 +589,24 @@ class ContextRecordQATest(ContextRecordInit, TestCase): def test_bulk_update(self): c = Client() pks = "{}-{}".format(self.context_records[0].pk, self.context_records[1].pk) - print(models.Parcel.objects.all()) - print(models.Unit.objects.all()) - print(models.Operation.objects.all()) c.login(username=self.username, password=self.password) response = c.get(reverse("contextrecord-qa-bulk-update", args=[pks])) - print(response) self.assertEqual(response.status_code, 200) - cr_1 = self.context_records[0] - cr_2 = self.context_records[1] - + site = models.ArchaeologicalSite.objects.create(reference="3333", name="test") + town = models.Town.objects.get(name="LILLE") + rel_type = models.RelationType.objects.get(label="Coupe") + unit = models.Unit.objects.get(label="Anomalie") parcel = models.Parcel.objects.all().first() - operation = models.Operation.objects.all().first() - parcel.operation = operation - cr_1.operation = operation - cr_2.operation = operation - unit = models.Unit.objects.all().first() - sym_rel_type = models.RelationType.objects.create( - symmetrical=True, txt_idx="sym" - ) - rel_type_1 = models.RelationType.objects.create( - symmetrical=False, txt_idx="rel_1" - ) data = { "qa_unit": unit.pk, - "qa_relation_type": sym_rel_type, + "qa_archaeological_site": site.pk, "qa_parcel": parcel.pk } response = c.post(reverse( - "contextrecord-qa-bulk-update", args=[pks]), data + "contextrecord-qa-bulk-update-confirm", args=[pks]), data ) if response.status_code != 200: @@ -628,8 +614,28 @@ class ContextRecordQATest(ContextRecordInit, TestCase): crs = models.ContextRecord.objects.all() for cr in crs: - print(cr.unit) self.assertEqual(cr.unit, unit) + self.assertEqual(cr.parcel, parcel) + self.assertEqual(cr.archaeological_site, site) + + self.create_context_record(data={"label": "CR 3"}) + cr_3 = self.context_records[2] + cr_3.operation = models.Operation.objects.all()[1] + cr_3.parcel = models.Parcel.objects.all()[2] + + pks = "{}-{}-{}".format( + self.context_records[0].pk, self.context_records[1].pk, cr_3.pk + ) + + data = { + "qa_parcel": parcel.pk + } + + response = c.post(reverse( + "contextrecord-qa-bulk-update-confirm", args=[pks]), data + ) + + self.assertNotEqual(cr_3.parcel, parcel) class ContextRecordSearchTest(ContextRecordInit, TestCase, SearchText): |