diff options
| author | Étienne Loks <etienne.loks@iggdrasil.net> | 2017-05-15 11:34:32 +0200 |
|---|---|---|
| committer | Étienne Loks <etienne.loks@iggdrasil.net> | 2017-05-15 11:34:32 +0200 |
| commit | 54d6c8789255aa5500df6dc583a8fdbe96b8442a (patch) | |
| tree | 9b6101e1df20be739157df2c8d6f391119bf3e48 /archaeological_context_records/tests.py | |
| parent | c3e4c309deb686685e34a441445b6104ba4913a7 (diff) | |
| parent | c18fccf766ea9fd82ca82d8e4a7938c83512c416 (diff) | |
| download | Ishtar-54d6c8789255aa5500df6dc583a8fdbe96b8442a.tar.bz2 Ishtar-54d6c8789255aa5500df6dc583a8fdbe96b8442a.zip | |
Merge branch 'master' into develop
Conflicts:
archaeological_finds/forms_treatments.py
Diffstat (limited to 'archaeological_context_records/tests.py')
| -rw-r--r-- | archaeological_context_records/tests.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/archaeological_context_records/tests.py b/archaeological_context_records/tests.py index e697459b5..df05f4898 100644 --- a/archaeological_context_records/tests.py +++ b/archaeological_context_records/tests.py @@ -369,7 +369,7 @@ class ContextRecordSearchTest(ContextRecordInit, TestCase): # test search between relations response = c.get(reverse('get-contextrecord'), {'label': 'cr 1', - 'relation_types_0': self.cr_rel_type.pk}) + 'cr_relation_types_0': self.cr_rel_type.pk}) self.assertEqual(json.loads(response.content)['total'], 2) # test search between related operations first_ope = self.operations[0] |