diff options
| author | Étienne Loks <etienne.loks@iggdrasil.net> | 2019-09-14 18:29:47 +0200 |
|---|---|---|
| committer | Étienne Loks <etienne.loks@iggdrasil.net> | 2019-09-14 18:29:47 +0200 |
| commit | 5ca7407d99b07694fd5facf612f3d2c8562c000b (patch) | |
| tree | 0aa879bf17c6dfab7879c85f76f15a69d2a843a8 /archaeological_finds | |
| parent | 26a7508ea2ae47ccbaf0e0bfc0d2bd4f64482824 (diff) | |
| download | Ishtar-5ca7407d99b07694fd5facf612f3d2c8562c000b.tar.bz2 Ishtar-5ca7407d99b07694fd5facf612f3d2c8562c000b.zip | |
Fix file imports - fix tests with redirs
Diffstat (limited to 'archaeological_finds')
| -rw-r--r-- | archaeological_finds/tests.py | 8 | ||||
| -rw-r--r-- | archaeological_finds/wizards.py | 4 |
2 files changed, 10 insertions, 2 deletions
diff --git a/archaeological_finds/tests.py b/archaeological_finds/tests.py index 2d6b85b1a..76e6764b2 100644 --- a/archaeological_finds/tests.py +++ b/archaeological_finds/tests.py @@ -245,6 +245,9 @@ class FindWizardCreationTest(WizardTest, FindInit, TestCase): url_name = 'find_creation' wizard_name = 'find_wizard' steps = views.find_creation_steps + redirect_url = "/find_modification/selec-find_modification?open_item="\ + "{last_id}" + model = models.Find form_datas = [ FormData( 'Find creation', @@ -302,6 +305,7 @@ class FindWizardDeletionWithWarehouseModTest(WizardTest, FindInit, TestCase): url_name = 'find_deletion' wizard_name = 'find_deletion_wizard' steps = views.find_deletion_steps + redirect_url = "/{}/selecw-{}".format(url_name, url_name) form_datas = [ FormData( 'Find deletion', @@ -319,7 +323,7 @@ class FindWizardDeletionWithWarehouseModTest(WizardTest, FindInit, TestCase): profile.save() find, bf = self.get_default_find(force=True) - self.form_datas[0].set('selecw', 'pk', find.pk) + self.form_datas[0].set('selecw', 'pks', find.pk) self.find_number = models.Find.objects.count() super(FindWizardDeletionWithWarehouseModTest, self).pre_wizard() @@ -333,6 +337,8 @@ class TreatmentWizardCreationTest(WizardTest, FindInit, TestCase): url_name = 'treatment_creation' wizard_name = 'treatment_wizard' steps = views.treatment_wizard_steps + redirect_url = "/treatment_search/general-treatment_search?" \ + "open_item={last_id}" form_datas = [ FormData( 'Move treatment (planned)', diff --git a/archaeological_finds/wizards.py b/archaeological_finds/wizards.py index b34bcdcbe..71bc6deed 100644 --- a/archaeological_finds/wizards.py +++ b/archaeological_finds/wizards.py @@ -194,8 +194,10 @@ class TreatmentWizard(TreatmentBase): if 'resulting_pk' in dct: dct['items'] = [] pks = dct.pop('resulting_pk') + if isinstance(pks, models.Find): + pks = [pks] if not isinstance(pks, (list, tuple)): - pks = pks.split(u',') + pks = str(pks).split(u',') for pk in pks: if isinstance(pk, models.Find): |