diff options
| author | Étienne Loks <etienne.loks@iggdrasil.net> | 2016-06-03 22:05:13 +0200 |
|---|---|---|
| committer | Étienne Loks <etienne.loks@iggdrasil.net> | 2016-06-03 22:05:13 +0200 |
| commit | dd098e6bab668d5d602b2d5c4dd64af3d0aa62b4 (patch) | |
| tree | 4fdfe0c828e975812fdc6a8ededba4995300ecc2 /ishtar_common/wizards.py | |
| parent | 5f77b4d18fdd1f4b8c6e967d65dc949197a28243 (diff) | |
| parent | 6bcaf64532e8b1ea76e5e74e3291fac2b238f838 (diff) | |
| download | Ishtar-dd098e6bab668d5d602b2d5c4dd64af3d0aa62b4.tar.bz2 Ishtar-dd098e6bab668d5d602b2d5c4dd64af3d0aa62b4.zip | |
Merge branch 'master' into v0.9
Conflicts:
ishtar_common/views.py
Diffstat (limited to 'ishtar_common/wizards.py')
| -rw-r--r-- | ishtar_common/wizards.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ishtar_common/wizards.py b/ishtar_common/wizards.py index e974942b7..49abe606f 100644 --- a/ishtar_common/wizards.py +++ b/ishtar_common/wizards.py @@ -510,7 +510,7 @@ class Wizard(NamedUrlWizardView): adds = {} # manage attributes relations if hasattr(self.model, 'ATTRS_EQUIV'): - for k in other_objs: + for k in other_objs.keys(): if k in self.model.ATTRS_EQUIV: new_k = self.model.ATTRS_EQUIV[k] if new_k in other_objs: |