Skip to content
This repository has been archived by the owner on Sep 12, 2018. It is now read-only.

MapManager (replaces PublicManager) #107

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 8 additions & 4 deletions leaflet_storage/managers.py
Original file line number Diff line number Diff line change
@@ -1,8 +1,12 @@
from django.contrib.gis.db import models
from django.db.models import Q

class MapManager(models.GeoManager):
def visible(self, request):
filter = Q(share_status=self.model.PUBLIC)

class PublicManager(models.GeoManager):
if request.user.is_authenticated():
filter = filter | Q(owner=request.user)
filter = filter | Q(editors=request.user)

def get_queryset(self):
return super(PublicManager, self).get_queryset().filter(
share_status=self.model.PUBLIC)
return self.filter(filter)
5 changes: 2 additions & 3 deletions leaflet_storage/models.py
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
from django.core.files.base import File

from .fields import DictField
from .managers import PublicManager
from .managers import MapManager


class NamedModel(models.Model):
Expand Down Expand Up @@ -139,8 +139,7 @@ class Map(NamedModel):
share_status = models.SmallIntegerField(choices=SHARE_STATUS, default=PUBLIC, verbose_name=_("share status"))
settings = DictField(blank=True, null=True, verbose_name=_("settings"))

objects = models.GeoManager()
public = PublicManager()
objects = MapManager()

def get_absolute_url(self):
return reverse("map", kwargs={'slug': self.slug or "map", 'pk': self.pk})
Expand Down