summaryrefslogtreecommitdiff
path: root/ishtar_common
diff options
context:
space:
mode:
authorÉtienne Loks <etienne.loks@iggdrasil.net>2019-02-13 23:46:30 +0100
committerÉtienne Loks <etienne.loks@iggdrasil.net>2019-04-24 19:38:56 +0200
commitcd4e5de78f1fa221da62e3c8af26372e62d3effc (patch)
treea6a104c79a6725c044ea8a83e5a05ff7320d8205 /ishtar_common
parent3d2a1569794c0e08cdbf1cbf0378617100ce8391 (diff)
downloadIshtar-cd4e5de78f1fa221da62e3c8af26372e62d3effc.tar.bz2
Ishtar-cd4e5de78f1fa221da62e3c8af26372e62d3effc.zip
Fix migration on new DB - fix filter field when no gis db is available
Diffstat (limited to 'ishtar_common')
-rw-r--r--ishtar_common/forms.py3
-rw-r--r--ishtar_common/migrations/0081_recreate_m2m_history.py1
2 files changed, 2 insertions, 2 deletions
diff --git a/ishtar_common/forms.py b/ishtar_common/forms.py
index 0bb97b980..57f48ff95 100644
--- a/ishtar_common/forms.py
+++ b/ishtar_common/forms.py
@@ -554,7 +554,8 @@ class IshtarForm(forms.Form, BSForm):
for profile_key in self.PROFILE_FILTER:
if not getattr(profile, profile_key):
for field_key in self.PROFILE_FILTER[profile_key]:
- self.fields.pop(field_key)
+ if field_key in self.fields.keys():
+ self.fields.pop(field_key)
if getattr(self, 'confirm', False):
return
for field in self.TYPES:
diff --git a/ishtar_common/migrations/0081_recreate_m2m_history.py b/ishtar_common/migrations/0081_recreate_m2m_history.py
index 3d7f28bb6..3cbe5cdbc 100644
--- a/ishtar_common/migrations/0081_recreate_m2m_history.py
+++ b/ishtar_common/migrations/0081_recreate_m2m_history.py
@@ -41,5 +41,4 @@ class Migration(migrations.Migration):
]
operations = [
- migrations.RunPython(recreate_m2m_migrations)
]