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

remove property "public", add AccessRestriction model

Browse source
This commit is contained in:
Laura Klünder 2017-07-13 18:43:03 +02:00
parent 945b5a7e0e
commit 20924b9845
6 changed files with 140 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -4,6 +4,7 @@ from django.apps import apps
from django.db import models
from django.utils.translation import ugettext_lazy as _
from c3nav.mapdata.models.access import AccessRestrictionMixin
from c3nav.mapdata.models.base import SerializableMixin, TitledMixin
from c3nav.mapdata.utils.models import get_submodels
@ -50,10 +51,9 @@ class LocationSlug(SerializableMixin, models.Model):
default_related_name = 'locationslugs'
class Location(LocationSlug, TitledMixin, models.Model):
class Location(LocationSlug, AccessRestrictionMixin, TitledMixin, models.Model):
can_search = models.BooleanField(default=True, verbose_name=_('can be searched'))
can_describe = models.BooleanField(default=True, verbose_name=_('can be used to describe a position'))
public = models.BooleanField(verbose_name=_('public'), default=True)
class Meta:
abstract = True
@ -75,7 +75,6 @@ class Location(LocationSlug, TitledMixin, models.Model):
result = super()._serialize(**kwargs)
result['can_search'] = self.can_search
result['can_describe'] = self.can_search
result['public'] = self.public
return result
def get_slug(self):