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

make theme ui in editor use changesets

Browse source
This commit is contained in:
Laura Klünder 2024-08-18 16:17:01 +02:00
parent 41aab65723
commit 02411b0181
1 changed files with 11 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -21,10 +21,8 @@ from shapely.geometry.geo import mapping
from c3nav.editor.models import ChangeSet, ChangeSetUpdate from c3nav.editor.models import ChangeSet, ChangeSetUpdate
from c3nav.mapdata.fields import GeometryField from c3nav.mapdata.fields import GeometryField
from c3nav.mapdata.forms import I18nModelFormMixin from c3nav.mapdata.forms import I18nModelFormMixin
from c3nav.mapdata.models import GraphEdge, LocationGroup from c3nav.mapdata.models import GraphEdge
from c3nav.mapdata.models.access import AccessPermission from c3nav.mapdata.models.access import AccessPermission
from c3nav.mapdata.models.geometry.space import ObstacleGroup
from c3nav.mapdata.models.theme import ThemeLocationGroupBackgroundColor, ThemeObstacleGroupBackgroundColor
from c3nav.routing.schemas import LocateRequestWifiPeerSchema from c3nav.routing.schemas import LocateRequestWifiPeerSchema
@ -34,6 +32,11 @@ class EditorFormBase(I18nModelFormMixin, ModelForm):
super().__init__(*args, **kwargs) super().__init__(*args, **kwargs)
creating = not self.instance.pk creating = not self.instance.pk
LocationGroup = request.changeset.wrap_model('LocationGroup')
ThemeLocationGroupBackgroundColor = request.changeset.wrap_model('ThemeLocationGroupBackgroundColor')
ThemeObstacleGroupBackgroundColor = request.changeset.wrap_model('ThemeObstacleGroupBackgroundColor')
ObstacleGroup = request.changeset.wrap_model('ObstacleGroup')
if self._meta.model.__name__ == 'Theme': if self._meta.model.__name__ == 'Theme':
if creating: if creating:
locationgroup_theme_colors = {} locationgroup_theme_colors = {}
@ -375,6 +378,11 @@ class EditorFormBase(I18nModelFormMixin, ModelForm):
groups = tuple((int(val) if val.isdigit() else val) for val in groups) groups = tuple((int(val) if val.isdigit() else val) for val in groups)
self.instance.groups.set(groups) self.instance.groups.set(groups)
LocationGroup = self.request.changeset.wrap_model('LocationGroup')
ThemeLocationGroupBackgroundColor = self.request.changeset.wrap_model('ThemeLocationGroupBackgroundColor')
ThemeObstacleGroupBackgroundColor = self.request.changeset.wrap_model('ThemeObstacleGroupBackgroundColor')
ObstacleGroup = self.request.changeset.wrap_model('ObstacleGroup')
if self._meta.model.__name__ == 'Theme': if self._meta.model.__name__ == 'Theme':
locationgroup_colors = {theme_location_group.location_group_id: theme_location_group locationgroup_colors = {theme_location_group.location_group_id: theme_location_group
for theme_location_group in self.instance.location_groups.all()} for theme_location_group in self.instance.location_groups.all()}