Merge branch 'master' into stage

Author: yvess

django/Makefile

@@ -1,4 +1,4 @@
-GEMEINDESCAN_WEBUI_DJANGO=0.3.2
+GEMEINDESCAN_WEBUI_DJANGO=0.3.3
 DOCKER_EXEC=$(shell command -v docker > /dev/null && echo "docker-compose exec django")
 
 .PHONY: all

django/docker/django/requirements/02.txt

@@ -11,8 +11,10 @@ curtsies==0.3.1
 Django==3.0.3
 django-cors-headers==3.2.1
 django-filter==2.2.0
+django-json-widget==1.0.0
 django-sortedm2m==3.0.0
 -e git+https://github.com/svleeuwen/sortedm2m-filter-horizontal-widget.git@4ce03f6b7e6022014838afb4a8aa4691fceb9e94#egg=django_sortedm2m_filter_horizontal_widget
+future==0.18.2
 graphene==2.1.8
 graphene-django==2.8.1
 graphql-core==2.2.1

django/gsmap/admin.py

@@ -1,5 +1,7 @@
 from django.contrib.gis import admin
+from django.contrib.postgres import fields
 from django.utils.translation import gettext as _
+from django_json_widget.widgets import JSONEditorWidget
 from sortedm2m_filter_horizontal_widget.forms import SortedFilteredSelectMultiple
 from gsmap.models import Municipality, Snapshot, Workspace
 
@@ -9,11 +11,12 @@ class MunicipalityAdmin(admin.OSMGeoAdmin):
 
 
 class SnapshotAdmin(admin.OSMGeoAdmin):
-    readonly_fields = ('id', 'created', 'modified')
+    readonly_fields = ('id', 'created', 'modified', 'get_absolute_link')
     fieldsets = (
         (_('Meta'), {
             'fields': (
-                'id', 'created', 'modified', 'is_showcase', 'archived', 'deleted', 'permission'
+                'id', 'get_absolute_link', 'created', 'modified',
+                'is_showcase', 'archived', 'deleted', 'permission'
             )
         }),
         (_('Main'), {
@@ -29,23 +32,30 @@ class SnapshotAdmin(admin.OSMGeoAdmin):
         #     ('perimeter',),
         # }),
     )
+
+    formfield_overrides = {
+        fields.JSONField: {
+            'widget': JSONEditorWidget
+        },
+    }
+
     list_display = ('id', 'title', 'municipality', 'permission', 'is_showcase',
                     'created', 'modified')
     list_filter = ('is_showcase', 'permission')
     search_fields = ['title', 'municipality__name', 'municipality__canton']
 
 
 class WorkspaceAdmin(admin.OSMGeoAdmin):
-    readonly_fields = ('id', 'created', 'modified')
+    readonly_fields = ('id', 'created', 'modified', 'get_absolute_link')
     fieldsets = (
         (_('Meta'), {
             'fields': (
-                'id', 'created', 'modified'
+                'id', 'get_absolute_link',
+                'created', 'modified'
             )
         }),
         (_('Main'), {
-            'fields':
-            ('title', 'description', 'snapshots'),
+            'fields': ('title', 'description', 'snapshots'),
         }),
     )
     list_display = ('id', 'title', 'created', 'modified')

django/gsmap/models.py

@@ -3,6 +3,8 @@
 from enum import IntFlag
 from django.contrib.gis.db import models
 from django.contrib.postgres import fields as pg_fields
+from django.contrib.sites.models import Site
+from django.utils.html import format_html
 from sortedm2m.fields import SortedManyToManyField
 from sorl.thumbnail import ImageField
 from gsuser.models import User
@@ -102,10 +104,21 @@ class Meta:
     )
     user = models.ForeignKey(User, on_delete=models.CASCADE)
 
+    def get_absolute_link(self):
+        domain = Site.objects.get_current().domain
+        return format_html(
+            f'<a href="//{domain}/{self.get_absolute_url()}" target="_blank">'
+            f'{domain}{self.get_absolute_url()}</a>'
+        )
+    get_absolute_link.short_description = "Snapshot Url"
+
+    def get_absolute_url(self):
+        return f'/{self.id}/'
+
     def save(self, *args, **kwargs):
         def test_exists(pk):
             if self.__class__.objects.filter(pk=pk):
-                new_id = create_slug_hash()
+                new_id = create_slug_hash_6()
                 test_exists(new_id)
             else:
                 return pk
@@ -115,7 +128,8 @@ def test_exists(pk):
         super().save(*args, **kwargs)
 
     def __str__(self):
-        return f'{self.id}, {self.title}, {self.get_permission_display()}'
+        return f'{self.municipality.fullname}, {self.title}, ' \
+               f'{self.id} ({self.get_permission_display()})'
 
 
 class Workspace(models.Model):
@@ -134,11 +148,23 @@ class Meta:
 
     snapshots = SortedManyToManyField(Snapshot)
 
+    def get_absolute_link(self):
+        domain = Site.objects.get_current().domain
+        return format_html(
+            f'<a href="//{domain}{self.get_absolute_url()}" target="_blank">'
+            f'{domain}{self.get_absolute_url()}</a>'
+        )
+    get_absolute_link.short_description = "Workspace Url"
+
+    def get_absolute_url(self):
+        first_id = self.snapshots.all().first().id
+        return f'/{self.id}/{first_id}/'
+
 
     def save(self, *args, **kwargs):
         def test_exists(pk):
             if self.__class__.objects.filter(pk=pk):
-                new_id = create_slug_hash()
+                new_id = create_slug_hash_5()
                 test_exists(new_id)
             else:
                 return pk

django/main/settings.py

@@ -37,6 +37,7 @@
     'sorl.thumbnail',
     'sortedm2m',
     'sortedm2m_filter_horizontal_widget',
+    'django_json_widget',
 
     # own
     'gsuser',

docker-images.yml

@@ -10,5 +10,5 @@ services:
     hostname: vue
 
   django:
-    image: smartuse/gemeindescan-webui-django:0.3.2
+    image: smartuse/gemeindescan-webui-django:0.3.3
     hostname: django