diff options
| author | Étienne Loks <etienne.loks@iggdrasil.net> | 2017-04-03 19:15:13 +0200 |
|---|---|---|
| committer | Étienne Loks <etienne.loks@iggdrasil.net> | 2017-04-03 19:15:13 +0200 |
| commit | 3f18460f80c89d5de4420fbe53fb39991cd08105 (patch) | |
| tree | 8cdcaf498db05da21634981c09108dede07c31ce | |
| parent | 3565d1fee6f675646f60c1690bb1c81549b227a9 (diff) | |
| download | Ishtar-3f18460f80c89d5de4420fbe53fb39991cd08105.tar.bz2 Ishtar-3f18460f80c89d5de4420fbe53fb39991cd08105.zip | |
Fix find modify action (refs #3405)
| -rw-r--r-- | archaeological_finds/views.py | 2 | ||||
| -rw-r--r-- | ishtar_common/models.py | 2 | ||||
| -rw-r--r-- | ishtar_common/wizards.py | 8 |
3 files changed, 10 insertions, 2 deletions
diff --git a/archaeological_finds/views.py b/archaeological_finds/views.py index 03094cbb0..680faf421 100644 --- a/archaeological_finds/views.py +++ b/archaeological_finds/views.py @@ -169,7 +169,7 @@ find_modification_wizard = FindModificationWizard.as_view([ def find_modify(request, pk): - # view = find_modification_wizard(request) + find_modification_wizard(request) FindModificationWizard.session_set_value( request, 'selec-find_modification', 'pk', pk, reset=True) return redirect( diff --git a/ishtar_common/models.py b/ishtar_common/models.py index 7873b63f8..bf5c6056a 100644 --- a/ishtar_common/models.py +++ b/ishtar_common/models.py @@ -191,6 +191,8 @@ def valid_ids(cls): def func(value): if "," in value: value = value.split(",") + if type(value) not in (list, tuple): + value = [value] for v in value: try: cls.objects.get(pk=v) diff --git a/ishtar_common/wizards.py b/ishtar_common/wizards.py index 61923d920..8d787d733 100644 --- a/ishtar_common/wizards.py +++ b/ishtar_common/wizards.py @@ -51,10 +51,16 @@ class MultiValueDict(BaseMultiValueDict): v = v() if type(v) in (list, tuple) and len(v) > 1: v = ",".join(v) - else: + elif type(v) not in (int, unicode): v = super(MultiValueDict, self).get(*args, **kwargs) return v + def getlist(self, *args, **kwargs): + lst = super(MultiValueDict, self).getlist(*args, **kwargs) + if type(lst) not in (tuple, list): + lst = [lst] + return lst + def check_rights(rights=[], redirect_url='/'): """ |