umap-project 2.5.1__py3-none-any.whl → 2.6.0__py3-none-any.whl

umap/__init__.py

@@ -1 +1 @@
-VERSION = "2.5.1"
+VERSION = "2.6.0"

umap/admin.py

@@ -1,6 +1,6 @@
 from django.contrib.gis import admin
 
-from .models import DataLayer, Licence, Map, Pictogram, TileLayer
+from .models import DataLayer, Licence, Map, Pictogram, Team, TileLayer
 
 
 class TileLayerAdmin(admin.ModelAdmin):
@@ -26,8 +26,13 @@ class PictogramAdmin(admin.ModelAdmin):
     list_filter = ("category",)
 
 
+class TeamAdmin(admin.ModelAdmin):
+    filter_horizontal = ("users",)
+
+
 admin.site.register(Map, MapAdmin)
 admin.site.register(DataLayer)
 admin.site.register(Pictogram, PictogramAdmin)
 admin.site.register(TileLayer, TileLayerAdmin)
 admin.site.register(Licence)
+admin.site.register(Team, TeamAdmin)

umap/context_processors.py

@@ -5,12 +5,13 @@ from . import VERSION
 
 def settings(request):
     return {
-        "UMAP_FEEDBACK_LINK": djsettings.UMAP_FEEDBACK_LINK,
+        "UMAP_HELP_URL": djsettings.UMAP_HELP_URL,
         "SITE_NAME": djsettings.SITE_NAME,
         "SITE_URL": djsettings.SITE_URL,
         "ENABLE_ACCOUNT_LOGIN": djsettings.ENABLE_ACCOUNT_LOGIN,
         "UMAP_READONLY": djsettings.UMAP_READONLY,
         "UMAP_DEMO_SITE": djsettings.UMAP_DEMO_SITE,
+        "UMAP_HOST_INFOS": djsettings.UMAP_HOST_INFOS,
     }
 
 

umap/decorators.py

@@ -5,7 +5,7 @@ from django.http import HttpResponseForbidden
 from django.shortcuts import get_object_or_404
 from django.urls import reverse_lazy
 
-from .models import Map
+from .models import Map, Team
 from .views import simple_json_response
 
 LOGIN_URL = getattr(settings, "LOGIN_URL", "login")
@@ -35,7 +35,7 @@ def can_edit_map(view_func):
         map_inst = get_object_or_404(Map, pk=kwargs["map_id"])
         user = request.user
         kwargs["map_inst"] = map_inst  # Avoid rerequesting the map in the view
-        if map_inst.edit_status >= map_inst.EDITORS:
+        if map_inst.edit_status >= map_inst.COLLABORATORS:
             can_edit = map_inst.can_edit(user=user, request=request)
             if not can_edit:
                 if map_inst.owner and not user.is_authenticated:
@@ -60,3 +60,14 @@ def can_view_map(view_func):
         return view_func(request, *args, **kwargs)
 
     return wrapper
+
+
+def team_members_only(view_func):
+    @wraps(view_func)
+    def wrapper(request, *args, **kwargs):
+        team = get_object_or_404(Team, pk=kwargs["pk"])
+        if not request.user.is_authenticated or team not in request.user.teams.all():
+            return HttpResponseForbidden()
+        return view_func(request, *args, **kwargs)
+
+    return wrapper

umap/forms.py

@@ -6,7 +6,7 @@ from django.forms.utils import ErrorList
 from django.template.defaultfilters import slugify
 from django.utils.translation import gettext_lazy as _
 
-from .models import DataLayer, Map
+from .models import DataLayer, Map, Team
 
 DEFAULT_LATITUDE = (
     settings.LEAFLET_LATITUDE if hasattr(settings, "LEAFLET_LATITUDE") else 51
@@ -36,7 +36,7 @@ class SendLinkForm(forms.Form):
 class UpdateMapPermissionsForm(forms.ModelForm):
     class Meta:
         model = Map
-        fields = ("edit_status", "editors", "share_status", "owner")
+        fields = ("edit_status", "editors", "share_status", "owner", "team")
 
 
 class AnonymousMapPermissionsForm(forms.ModelForm):
@@ -110,3 +110,27 @@ class UserProfileForm(forms.ModelForm):
     class Meta:
         model = User
         fields = ("username", "first_name", "last_name")
+
+
+class TeamMembersField(forms.ModelMultipleChoiceField):
+    def set_choices(self, choices):
+        iterator = self.iterator(self)
+        # Override queryset so to expose only selected choices:
+        # - we don't want a select with 100000 options
+        # - the select values will be used by the autocomplete widget to display
+        #   already existing members of the team
+        iterator.queryset = choices
+        self.choices = iterator
+
+
+class TeamForm(forms.ModelForm):
+    class Meta:
+        model = Team
+        fields = ["name", "description", "members"]
+
+    def __init__(self, *args, **kwargs):
+        super().__init__(*args, **kwargs)
+        self.fields["members"].set_choices(self.initial["members"])
+        self.fields["members"].widget.attrs["hidden"] = "hidden"
+
+    members = TeamMembersField(queryset=User.objects.all())