diff options
| author | Étienne Loks <etienne.loks@iggdrasil.net> | 2017-02-25 12:45:06 +0100 |
|---|---|---|
| committer | Étienne Loks <etienne.loks@iggdrasil.net> | 2017-02-25 12:45:06 +0100 |
| commit | f76802e1574ebe6f99b2b7fde2cff7cd9f76a6a4 (patch) | |
| tree | 724f9865add02df41e6e70f67642cc7eb421e044 | |
| parent | c4396d12a46c533428258105e47578a2be43251b (diff) | |
| download | Ishtar-f76802e1574ebe6f99b2b7fde2cff7cd9f76a6a4.tar.bz2 Ishtar-f76802e1574ebe6f99b2b7fde2cff7cd9f76a6a4.zip | |
Operations: fix bulk update of context records (refs #3472)
| -rw-r--r-- | archaeological_context_records/models.py | 2 | ||||
| -rw-r--r-- | archaeological_operations/tests.py | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/archaeological_context_records/models.py b/archaeological_context_records/models.py index 4fcbcf258..b36c56a85 100644 --- a/archaeological_context_records/models.py +++ b/archaeological_context_records/models.py @@ -300,7 +300,7 @@ class ContextRecord(BaseHistorizedItem, ImageModel, OwnPerms, context_records_cached_label_bulk_update.section || '{join}' || context_records_cached_label_bulk_update.number || '{join}' || context_records_cached_label_bulk_update.label - FROM t + FROM context_records_cached_label_bulk_update WHERE cr.id = context_records_cached_label_bulk_update.id AND cr.id IN ( SELECT id FROM archaeological_context_records_contextrecord diff --git a/archaeological_operations/tests.py b/archaeological_operations/tests.py index f0d07c33c..18548b0b1 100644 --- a/archaeological_operations/tests.py +++ b/archaeological_operations/tests.py @@ -811,7 +811,7 @@ class OperationTest(TestCase, OperationInitTest): operation.save() cr = ContextRecord.objects.get(pk=cr.pk) ope_id, parcel_sec, parcel_nb, cr_label = cr.cached_label.split(' | ') - self.assertEqual(ope_id, '666'.format(settings.ISHTAR_OPE_PREFIX)) + self.assertEqual(ope_id, '{}666'.format(settings.ISHTAR_OPE_PREFIX)) class OperationSearchTest(TestCase, OperationInitTest): |