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

fix ?detailed-logic

Browse source
This commit is contained in:
Laura Klünder 2017-10-27 15:05:41 +02:00
parent 879f550f84
commit f99779e9de
2 changed files with 6 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/c3nav/mapdata/models/base.py
View file

@ -47,10 +47,8 @@ class TitledMixin(SerializableMixin, models.Model):
super().__init__(*args, **kwargs) super().__init__(*args, **kwargs)
self.titles = self.titles.copy() self.titles = self.titles.copy()
def serialize(self, detailed=True, **kwargs): def serialize(self, **kwargs):
result = super().serialize(detailed=detailed, **kwargs) result = super().serialize(**kwargs)
if not detailed:
result.pop('title', None)
return result return result
def _serialize(self, **kwargs): def _serialize(self, **kwargs):

8
src/c3nav/mapdata/models/locations.py
View file

@ -1,3 +1,4 @@
from collections import OrderedDict
from contextlib import suppress from contextlib import suppress
from django.apps import apps from django.apps import apps
@ -73,10 +74,9 @@ class Location(LocationSlug, AccessRestrictionMixin, TitledMixin, models.Model):
def serialize(self, detailed=True, **kwargs): def serialize(self, detailed=True, **kwargs):
result = super().serialize(detailed=detailed, **kwargs) result = super().serialize(detailed=detailed, **kwargs)
if not detailed: if not detailed:
result.pop('type', None) result = OrderedDict((
result.pop('id', None) (name, result[name]) for name in ('slug', 'title', 'subtitle')
result.pop('slug', None) ))
result.pop('target', None)
return result return result
def _serialize(self, **kwargs): def _serialize(self, **kwargs):