2025-summer/team-3
12
Fork 0
Code Issues Pull requests Projects Releases Activity

fix problem with editor and main_point

Browse source
This commit is contained in:
Laura Klünder 2023-12-24 16:37:09 +01:00
parent 29bd8fa5ad
commit f23aaf86bf
2 changed files with 6 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/c3nav/editor/forms.py
View file

@ -53,7 +53,11 @@ class EditorFormBase(I18nModelFormMixin, ModelForm):
# hide geometry widget
self.fields['main_point'].widget = HiddenInput()
if not creating:
self.initial['main_point'] = mapping(self.instance.main_point) if self.instance.main_point else ""
self.initial['main_point'] = (
mapping(self.instance.main_point)
if self.instance.main_point and not self.instance.main_point.is_empty
else None
)
if self._meta.model.__name__ == 'Source' and self.request.user.is_superuser:
Source = self.request.changeset.wrap_model('Source')

2
src/c3nav/mapdata/fields.py
View file

@ -50,7 +50,7 @@ class GeometryField(models.JSONField):
return name, path, args, kwargs
def from_db_value(self, value, expression, connection):
if value is None or value == '':
if value is None or value == '' or value == "null":
return None
return WrappedGeometry(super().from_db_value(value, expression, connection))