From 57d97150f2086b4d158d85902582e301d8277f3d Mon Sep 17 00:00:00 2001 From: mipel Date: Fri, 2 Jul 2021 09:45:45 +0200 Subject: [PATCH] Permission rethinking * No detailed permissions due to django constraints on model-based permissions * instead: logic controlled permission by group membership * adds translations --- konova/management/commands/setup_data.py | 8 +++++--- konova/models.py | 1 + konova/settings.py | 5 +++++ 3 files changed, 11 insertions(+), 3 deletions(-) diff --git a/konova/management/commands/setup_data.py b/konova/management/commands/setup_data.py index 60b9683d..f0c46d8a 100644 --- a/konova/management/commands/setup_data.py +++ b/konova/management/commands/setup_data.py @@ -7,6 +7,8 @@ Created on: 15.12.20 """ from django.utils.translation import gettext_lazy as _ +from konova.settings import DEFAULT_GROUP, ZB_GROUP, ETS_GROUP + TEST_ORGANISATION_DATA = [ { "name": "Test_Official_1", @@ -24,12 +26,12 @@ TEST_ORGANISATION_DATA = [ GROUPS_DATA = [ { - "name": _("Default"), + "name": DEFAULT_GROUP, }, { - "name": _("Registration office"), + "name": ZB_GROUP, }, { - "name": _("Conservation office"), + "name": ETS_GROUP, }, ] \ No newline at end of file diff --git a/konova/models.py b/konova/models.py index 5bf5b2a8..c7348cbc 100644 --- a/konova/models.py +++ b/konova/models.py @@ -68,3 +68,4 @@ class Geometry(BaseResource): Outsourced geometry model so multiple versions of the same object can refer to the same geometry if it is not changed """ geom = MultiPolygonField(null=True, blank=True) + diff --git a/konova/settings.py b/konova/settings.py index 16767498..a25f0cd7 100644 --- a/konova/settings.py +++ b/konova/settings.py @@ -49,3 +49,8 @@ SSO_PUBLIC_KEY = "CHANGE_ME" DEFAULT_LAT = 50.00 DEFAULT_LON = 7.00 DEFAULT_ZOOM = 8.0 + +# GROUPS +DEFAULT_GROUP = _("Default") +ZB_GROUP = _("Registration office") +ETS_GROUP = _("Conservation office")