@@ -18,6 +24,8 @@
{% trans 'Alert' %}!
/* Set for widget initial atomic capabilities */
ga.Editing.widget.initial_atomic_capabilities = {{ initial_atomic_capabilities|safe }};
+ ga.Editing.widget.multilayer = {{ multilayer|lower }};
+ ga.Editing.widget.layerinfobaseurl= '/qdjango/api/info/layer/';
ga.Editing.widget.init();
\ No newline at end of file
diff --git a/g3w-admin/editing/templates/editing/project_layers_action.html b/g3w-admin/editing/templates/editing/project_layers_action.html
new file mode 100644
index 000000000..8acf0373b
--- /dev/null
+++ b/g3w-admin/editing/templates/editing/project_layers_action.html
@@ -0,0 +1,13 @@
+{% load i18n %}
+{% load static %}
+
+
+
+
+
+
+
+
diff --git a/g3w-admin/editing/tests/test_api.py b/g3w-admin/editing/tests/test_api.py
index fced001ef..a72149027 100644
--- a/g3w-admin/editing/tests/test_api.py
+++ b/g3w-admin/editing/tests/test_api.py
@@ -1659,8 +1659,6 @@ def test_layer_info_api(self):
response = client.get(url_layer, {}, format='json')
self.assertEqual(response.status_code, 200)
- print(json.loads(response.content)['results'])
-
jcontent = json.loads(response.content)['results']
self.assertEqual(len(jcontent), 2)
diff --git a/g3w-admin/editing/tests/test_views.py b/g3w-admin/editing/tests/test_views.py
index 1ac88b2df..6c21cb1e8 100644
--- a/g3w-admin/editing/tests/test_views.py
+++ b/g3w-admin/editing/tests/test_views.py
@@ -230,6 +230,332 @@ def test_editing_layer_active(self):
self.assertFalse(self.test_user4.has_perm('qdjango.delete_feature', cities_layer))
self.assertFalse(self.test_user4.has_perm('qdjango.change_attr_feature', cities_layer))
+ def test_editing_multi_layer_active(self):
+ """ Testing view for activation of editing capability on multi layer """
+
+ # Get qdjango layer instances
+ cities_layer_id = 'cities_54d40b01_2af8_4b17_8495_c5833485536e'
+ cities_layer = self.editing_project.instance.layer_set.get(
+ qgs_layer_id=cities_layer_id)
+
+ # Get layer
+ countries_layer_id = 'countries_63e59c18_a1d0_4e25_968a_ccbaecd11725'
+ countries_layer = self.editing_project.instance.layer_set.get(
+ qgs_layer_id=countries_layer_id)
+
+ # Not activated
+ with self.assertRaises(ObjectDoesNotExist) as ex:
+ G3WEditingLayer.objects.get(layer_id=cities_layer.pk)
+
+ with self.assertRaises(ObjectDoesNotExist) as ex:
+ G3WEditingLayer.objects.get(layer_id=countries_layer.pk)
+
+ # TEST activate/deactivate editing
+ url = reverse('editing-multi-layer-active', args=[
+ self.editing_project.instance.group.slug,
+ 'qdjango',
+ self.editing_project.instance.slug
+ ])
+
+ data = {
+ 'active': 'on',
+ 'layers': [cities_layer.pk, countries_layer.pk],
+ 'scale': 10000
+ }
+
+ self.assertTrue(
+ self.client.login(
+ username=self.test_user_admin1.username,
+ password=self.test_user_admin1.username
+ )
+ )
+
+ res = self.client.post(url, data)
+
+ # redirect on ok results
+ self.assertEqual(res.status_code, 302)
+
+ editing_layers = G3WEditingLayer.objects.filter(layer_id__in=[cities_layer.pk, countries_layer.pk])
+ self.assertTrue(len(editing_layers) == 2)
+ self.assertEqual(editing_layers[0].scale, 10000)
+ self.assertEqual(editing_layers[1].scale, 10000)
+
+ # Check ATOMIC permissions
+ # ========================
+
+ # Give permissions to viewers and user_groups viewers
+ assign_perm('view_project', self.test_user3, self.editing_project.instance)
+ assign_perm('view_project', self.test_user_group1, self.editing_project.instance)
+
+ data.update({
+ 'viewer_users': [self.test_user3.pk],
+ 'user_groups_viewer': [self.test_user_group1.pk]
+ })
+
+ res = self.client.post(url, data)
+
+ # redirect on ok results
+ self.assertEqual(res.status_code, 302)
+
+ # Users
+ self.assertTrue(self.test_user3.has_perm('qdjango.change_layer', cities_layer))
+ self.assertFalse(self.test_user3.has_perm('qdjango.add_feature', cities_layer))
+ self.assertFalse(self.test_user3.has_perm('qdjango.change_feature', cities_layer))
+ self.assertFalse(self.test_user3.has_perm('qdjango.delete_feature', cities_layer))
+ self.assertFalse(self.test_user3.has_perm('qdjango.change_attr_feature', cities_layer))
+
+ self.assertTrue(self.test_user3.has_perm('qdjango.change_layer', countries_layer))
+ self.assertFalse(self.test_user3.has_perm('qdjango.add_feature', countries_layer))
+ self.assertFalse(self.test_user3.has_perm('qdjango.change_feature', countries_layer))
+ self.assertFalse(self.test_user3.has_perm('qdjango.delete_feature', countries_layer))
+ self.assertFalse(self.test_user3.has_perm('qdjango.change_attr_feature', countries_layer))
+
+ # User_groups
+ self.assertTrue(self.test_user4.has_perm('qdjango.change_layer', cities_layer))
+ self.assertFalse(self.test_user4.has_perm('qdjango.add_feature', cities_layer))
+ self.assertFalse(self.test_user4.has_perm('qdjango.change_feature', cities_layer))
+ self.assertFalse(self.test_user4.has_perm('qdjango.delete_feature', cities_layer))
+ self.assertFalse(self.test_user4.has_perm('qdjango.change_attr_feature', cities_layer))
+
+ self.assertTrue(self.test_user4.has_perm('qdjango.change_layer', countries_layer))
+ self.assertFalse(self.test_user4.has_perm('qdjango.add_feature', countries_layer))
+ self.assertFalse(self.test_user4.has_perm('qdjango.change_feature', countries_layer))
+ self.assertFalse(self.test_user4.has_perm('qdjango.delete_feature', countries_layer))
+ self.assertFalse(self.test_user4.has_perm('qdjango.change_attr_feature', countries_layer))
+
+ data.update({
+ 'layers': [cities_layer.pk],
+ 'viewer_users': [self.test_user3.pk],
+ f'user_add_capability_{self.test_user3.pk}': 'on',
+ f'user_delete_capability_{self.test_user3.pk}': 'on',
+ 'user_groups_viewer': [self.test_user_group1.pk],
+ f'group_add_capability_{self.test_user_group1.pk}': 'on',
+ f'group_change_capability_{self.test_user_group1.pk}': 'on',
+ })
+
+ res = self.client.post(url, data)
+
+ # redirect on ok results
+ self.assertEqual(res.status_code, 302)
+
+ # Users
+ self.assertTrue(self.test_user3.has_perm('qdjango.change_layer', cities_layer))
+ self.assertTrue(self.test_user3.has_perm('qdjango.add_feature', cities_layer))
+ self.assertFalse(self.test_user3.has_perm('qdjango.change_feature', cities_layer))
+ self.assertTrue(self.test_user3.has_perm('qdjango.delete_feature', cities_layer))
+ self.assertFalse(self.test_user3.has_perm('qdjango.change_attr_feature', cities_layer))
+
+ self.assertTrue(self.test_user3.has_perm('qdjango.change_layer', countries_layer))
+ self.assertFalse(self.test_user3.has_perm('qdjango.add_feature', countries_layer))
+ self.assertFalse(self.test_user3.has_perm('qdjango.change_feature', countries_layer))
+ self.assertFalse(self.test_user3.has_perm('qdjango.delete_feature', countries_layer))
+ self.assertFalse(self.test_user3.has_perm('qdjango.change_attr_feature', countries_layer))
+
+ # User_groups
+ self.assertTrue(self.test_user4.has_perm('qdjango.change_layer', cities_layer))
+ self.assertTrue(self.test_user4.has_perm('qdjango.add_feature', cities_layer))
+ self.assertTrue(self.test_user4.has_perm('qdjango.change_feature', cities_layer))
+ self.assertFalse(self.test_user4.has_perm('qdjango.delete_feature', cities_layer))
+ self.assertFalse(self.test_user4.has_perm('qdjango.change_attr_feature', cities_layer))
+
+ self.assertTrue(self.test_user4.has_perm('qdjango.change_layer', countries_layer))
+ self.assertFalse(self.test_user4.has_perm('qdjango.add_feature', countries_layer))
+ self.assertFalse(self.test_user4.has_perm('qdjango.change_feature', countries_layer))
+ self.assertFalse(self.test_user4.has_perm('qdjango.delete_feature', countries_layer))
+ self.assertFalse(self.test_user4.has_perm('qdjango.change_attr_feature', countries_layer))
+
+ data = {
+ 'layers': [cities_layer.pk, countries_layer.pk],
+ 'active': 'on',
+ 'scale': 10000,
+ 'viewer_users': [self.test_user3.pk],
+ 'user_groups_viewer': [self.test_user_group1.pk],
+ f'user_add_capability_{self.test_user3.pk}': 'on',
+ f'user_change_capability_{self.test_user3.pk}': 'on',
+ f'group_add_capability_{self.test_user_group1.pk}': 'on',
+ f'group_changeattributes_capability_{self.test_user_group1.pk}': 'on',
+ }
+
+ res = self.client.post(url, data)
+
+ # redirect on ok results
+ self.assertEqual(res.status_code, 302)
+
+ # Users
+ self.assertTrue(self.test_user3.has_perm('qdjango.change_layer', cities_layer))
+ self.assertTrue(self.test_user3.has_perm('qdjango.add_feature', cities_layer))
+ self.assertTrue(self.test_user3.has_perm('qdjango.change_feature', cities_layer))
+ self.assertFalse(self.test_user3.has_perm('qdjango.delete_feature', cities_layer))
+ self.assertFalse(self.test_user3.has_perm('qdjango.change_attr_feature', cities_layer))
+
+ self.assertTrue(self.test_user3.has_perm('qdjango.change_layer', countries_layer))
+ self.assertTrue(self.test_user3.has_perm('qdjango.add_feature', countries_layer))
+ self.assertTrue(self.test_user3.has_perm('qdjango.change_feature', countries_layer))
+ self.assertFalse(self.test_user3.has_perm('qdjango.delete_feature', countries_layer))
+ self.assertFalse(self.test_user3.has_perm('qdjango.change_attr_feature', countries_layer))
+
+ # User_groups
+ self.assertTrue(self.test_user4.has_perm('qdjango.change_layer', cities_layer))
+ self.assertTrue(self.test_user4.has_perm('qdjango.add_feature', cities_layer))
+ self.assertFalse(self.test_user4.has_perm('qdjango.change_feature', cities_layer))
+ self.assertFalse(self.test_user4.has_perm('qdjango.delete_feature', cities_layer))
+ self.assertTrue(self.test_user4.has_perm('qdjango.change_attr_feature', cities_layer))
+
+ self.assertTrue(self.test_user4.has_perm('qdjango.change_layer', countries_layer))
+ self.assertTrue(self.test_user4.has_perm('qdjango.add_feature', countries_layer))
+ self.assertFalse(self.test_user4.has_perm('qdjango.change_feature', countries_layer))
+ self.assertFalse(self.test_user4.has_perm('qdjango.delete_feature', countries_layer))
+ self.assertTrue(self.test_user4.has_perm('qdjango.change_attr_feature', countries_layer))
+
+ # Deactive editing for countries_layer
+ data = {
+ 'layers': [countries_layer.pk],
+ }
+
+ res = self.client.post(url, data)
+
+ # redirect on ok results
+ self.assertEqual(res.status_code, 302)
+
+ editing_layers = G3WEditingLayer.objects.filter(layer_id__in=[cities_layer.pk, countries_layer.pk])
+ self.assertTrue(len(editing_layers) == 1)
+
+ # Users
+ self.assertTrue(self.test_user3.has_perm('qdjango.change_layer', cities_layer))
+ self.assertTrue(self.test_user3.has_perm('qdjango.add_feature', cities_layer))
+ self.assertTrue(self.test_user3.has_perm('qdjango.change_feature', cities_layer))
+ self.assertFalse(self.test_user3.has_perm('qdjango.delete_feature', cities_layer))
+ self.assertFalse(self.test_user3.has_perm('qdjango.change_attr_feature', cities_layer))
+
+ self.assertFalse(self.test_user3.has_perm('qdjango.change_layer', countries_layer))
+ self.assertFalse(self.test_user3.has_perm('qdjango.add_feature', countries_layer))
+ self.assertFalse(self.test_user3.has_perm('qdjango.change_feature', countries_layer))
+ self.assertFalse(self.test_user3.has_perm('qdjango.delete_feature', countries_layer))
+ self.assertFalse(self.test_user3.has_perm('qdjango.change_attr_feature', countries_layer))
+
+ # User_groups
+ self.assertTrue(self.test_user4.has_perm('qdjango.change_layer', cities_layer))
+ self.assertTrue(self.test_user4.has_perm('qdjango.add_feature', cities_layer))
+ self.assertFalse(self.test_user4.has_perm('qdjango.change_feature', cities_layer))
+ self.assertFalse(self.test_user4.has_perm('qdjango.delete_feature', cities_layer))
+ self.assertTrue(self.test_user4.has_perm('qdjango.change_attr_feature', cities_layer))
+
+ self.assertFalse(self.test_user4.has_perm('qdjango.change_layer', countries_layer))
+ self.assertFalse(self.test_user4.has_perm('qdjango.add_feature', countries_layer))
+ self.assertFalse(self.test_user4.has_perm('qdjango.change_feature', countries_layer))
+ self.assertFalse(self.test_user4.has_perm('qdjango.delete_feature', countries_layer))
+ self.assertFalse(self.test_user4.has_perm('qdjango.change_attr_feature', countries_layer))
+
+ # Deactive editing for all 2 layers
+ data = {
+ 'layers': [countries_layer.pk, cities_layer.pk],
+ }
+
+ res = self.client.post(url, data)
+
+ # redirect on ok results
+ self.assertEqual(res.status_code, 302)
+
+ editing_layers = G3WEditingLayer.objects.filter(layer_id__in=[cities_layer.pk, countries_layer.pk])
+ self.assertTrue(len(editing_layers) == 0)
+
+ # Users
+ self.assertFalse(self.test_user3.has_perm('qdjango.change_layer', cities_layer))
+ self.assertFalse(self.test_user3.has_perm('qdjango.add_feature', cities_layer))
+ self.assertFalse(self.test_user3.has_perm('qdjango.change_feature', cities_layer))
+ self.assertFalse(self.test_user3.has_perm('qdjango.delete_feature', cities_layer))
+ self.assertFalse(self.test_user3.has_perm('qdjango.change_attr_feature', cities_layer))
+
+ self.assertFalse(self.test_user3.has_perm('qdjango.change_layer', countries_layer))
+ self.assertFalse(self.test_user3.has_perm('qdjango.add_feature', countries_layer))
+ self.assertFalse(self.test_user3.has_perm('qdjango.change_feature', countries_layer))
+ self.assertFalse(self.test_user3.has_perm('qdjango.delete_feature', countries_layer))
+ self.assertFalse(self.test_user3.has_perm('qdjango.change_attr_feature', countries_layer))
+
+ # User_groups
+ self.assertFalse(self.test_user4.has_perm('qdjango.change_layer', cities_layer))
+ self.assertFalse(self.test_user4.has_perm('qdjango.add_feature', cities_layer))
+ self.assertFalse(self.test_user4.has_perm('qdjango.change_feature', cities_layer))
+ self.assertFalse(self.test_user4.has_perm('qdjango.delete_feature', cities_layer))
+ self.assertFalse(self.test_user4.has_perm('qdjango.change_attr_feature', cities_layer))
+
+ self.assertFalse(self.test_user4.has_perm('qdjango.change_layer', countries_layer))
+ self.assertFalse(self.test_user4.has_perm('qdjango.add_feature', countries_layer))
+ self.assertFalse(self.test_user4.has_perm('qdjango.change_feature', countries_layer))
+ self.assertFalse(self.test_user4.has_perm('qdjango.delete_feature', countries_layer))
+ self.assertFalse(self.test_user4.has_perm('qdjango.change_attr_feature', countries_layer))
+
+
+ # Test override of single layer editing property
+ # ----------------------------------------------
+
+ url_single_layer = reverse('editing-layer-active', args=[
+ self.editing_project.instance.group.slug,
+ 'qdjango',
+ self.editing_project.instance.slug,
+ cities_layer.pk
+ ])
+
+ data = {
+ 'active': 'on',
+ 'scale': 10000,
+ 'viewer_users': [self.test_user3.pk],
+ f'user_add_capability_{self.test_user3.pk}': 'on',
+ f'user_delete_capability_{self.test_user3.pk}': 'on',
+ 'user_groups_viewer': [self.test_user_group1.pk],
+ f'group_add_capability_{self.test_user_group1.pk}': 'on',
+ f'group_change_capability_{self.test_user_group1.pk}': 'on',
+ }
+
+ res = self.client.post(url_single_layer, data)
+
+ # redirect on ok results
+ self.assertEqual(res.status_code, 302)
+
+ # Users
+ self.assertTrue(self.test_user3.has_perm('qdjango.change_layer', cities_layer))
+ self.assertTrue(self.test_user3.has_perm('qdjango.add_feature', cities_layer))
+ self.assertFalse(self.test_user3.has_perm('qdjango.change_feature', cities_layer))
+ self.assertTrue(self.test_user3.has_perm('qdjango.delete_feature', cities_layer))
+ self.assertFalse(self.test_user3.has_perm('qdjango.change_attr_feature', cities_layer))
+
+ # User_groups
+ self.assertTrue(self.test_user4.has_perm('qdjango.change_layer', cities_layer))
+ self.assertTrue(self.test_user4.has_perm('qdjango.add_feature', cities_layer))
+ self.assertTrue(self.test_user4.has_perm('qdjango.change_feature', cities_layer))
+ self.assertFalse(self.test_user4.has_perm('qdjango.delete_feature', cities_layer))
+ self.assertFalse(self.test_user4.has_perm('qdjango.change_attr_feature', cities_layer))
+
+ # Override
+ data = {
+ 'active': 'on',
+ 'layers': [cities_layer.pk],
+ 'scale': 10000,
+ 'viewer_users': [self.test_user3.pk],
+ f'user_add_capability_{self.test_user3.pk}': 'on',
+ 'user_groups_viewer': [self.test_user_group1.pk],
+ f'group_add_capability_{self.test_user_group1.pk}': 'on',
+ }
+
+ res = self.client.post(url, data)
+
+ # redirect on ok results
+ self.assertEqual(res.status_code, 302)
+
+ # Users
+ self.assertTrue(self.test_user3.has_perm('qdjango.change_layer', cities_layer))
+ self.assertTrue(self.test_user3.has_perm('qdjango.add_feature', cities_layer))
+ self.assertFalse(self.test_user3.has_perm('qdjango.change_feature', cities_layer))
+ self.assertFalse(self.test_user3.has_perm('qdjango.delete_feature', cities_layer))
+ self.assertFalse(self.test_user3.has_perm('qdjango.change_attr_feature', cities_layer))
+
+ # User_groups
+ self.assertTrue(self.test_user4.has_perm('qdjango.change_layer', cities_layer))
+ self.assertTrue(self.test_user4.has_perm('qdjango.add_feature', cities_layer))
+ self.assertFalse(self.test_user4.has_perm('qdjango.change_feature', cities_layer))
+ self.assertFalse(self.test_user4.has_perm('qdjango.delete_feature', cities_layer))
+ self.assertFalse(self.test_user4.has_perm('qdjango.change_attr_feature', cities_layer))
+
def test_editing_layer_active_logging_fields(self):
""" Test active logging fields for insert and update """
diff --git a/g3w-admin/editing/urls.py b/g3w-admin/editing/urls.py
index ab1a5eb23..1be7aa6b3 100644
--- a/g3w-admin/editing/urls.py
+++ b/g3w-admin/editing/urls.py
@@ -13,6 +13,7 @@
from .views import (
UploadFileView,
ActiveEditingLayerView,
+ ActiveEditingMultiLayerView
)
@@ -36,5 +37,10 @@
login_required(ActiveEditingLayerView.as_view()),
name='editing-layer-active'
),
+ re_path(
+ '^(?P
[-_\w\d]+)/(?P[-_\w\d]+)/(?P[-_\w\d]+)/layers/active/$',
+ login_required(ActiveEditingMultiLayerView.as_view()),
+ name='editing-multi-layer-active'
+ ),
]
\ No newline at end of file
diff --git a/g3w-admin/editing/views.py b/g3w-admin/editing/views.py
index 5f6f8314f..e2b77c8f3 100644
--- a/g3w-admin/editing/views.py
+++ b/g3w-admin/editing/views.py
@@ -19,7 +19,7 @@
from core.utils.vector import BaseUserMediaHandler
from usersmanage.utils import setPermissionUserObject, get_viewers_for_object, \
get_user_groups_for_object
-from .forms import ActiveEditingLayerForm
+from .forms import ActiveEditingLayerForm, ActiveEditingMultiLayerForm
from .models import G3WEditingLayer, EDITING_ATOMIC_PERMISSIONS
import os
import json
@@ -126,7 +126,7 @@ class ActiveEditingLayerView(AjaxableFormResponseMixin, G3WProjectViewMixin, G3W
@method_decorator(project_type_permission_required('change_project', ('project_type', 'project_slug'),
return_403=True))
def dispatch(self, request, *args, **kwargs):
- self.layer_id = kwargs['layer_id']
+ self.layer_id = kwargs.get('layer_id')
# Instance user/groups atomic capabilitites
_capabilities = {ap:[] for ap in EDITING_ATOMIC_PERMISSIONS}
@@ -144,6 +144,23 @@ def dispatch(self, request, *args, **kwargs):
def get_success_url(self):
return None
+ def get_initial_viewer_users(self, layer):
+ """ Get from db viewer users with 'change_layer' permission on layer """
+
+ with_anonymous = getattr(settings, 'EDITING_ANONYMOUS', False)
+ viewers = get_viewers_for_object(layer, self.request.user, 'change_layer',
+ with_anonymous=with_anonymous)
+
+ editor_pk = layer.project.editor.pk if layer.project.editor else None
+ editor2_pk = layer.project.editor2.pk if layer.project.editor2 else None
+ return with_anonymous, editor_pk, editor2_pk, [int(o.id) for o in viewers if o.id not in (editor_pk, editor2_pk)]
+
+ def get_initial_viewer_user_groups(self, layer):
+ """ Get from db viewer group users with 'change_layer' permission on layer """
+
+ return [o.id for o in get_user_groups_for_object(layer, self.request.user, 'change_layer', 'viewer')]
+
+
def get_form_kwargs(self):
kwargs = super(ActiveEditingLayerView, self).get_form_kwargs()
@@ -167,18 +184,12 @@ def get_form_kwargs(self):
kwargs['initial']['active'] = False
# get viewer users
- with_anonymous = getattr(settings, 'EDITING_ANONYMOUS', False)
- viewers = get_viewers_for_object(self.layer, self.request.user, 'change_layer', with_anonymous=with_anonymous)
-
- editor_pk = self.layer.project.editor.pk if self.layer.project.editor else None
- editor2_pk = self.layer.project.editor2.pk if self.layer.project.editor2 else None
- self.initial_viewer_users = kwargs['initial']['viewer_users'] = [int(o.id) for o in viewers
- if o.id not in (editor_pk, editor2_pk)]
+ with_anonymous, editor_pk, editor2_pk, kwargs['initial']['viewer_users'] = self.get_initial_viewer_users(self.layer)
+ self.initial_viewer_users = kwargs['initial']['viewer_users']
self.initial_atomic_capabilitites['user']['change_layer'] = self.initial_viewer_users
- group_viewers = get_user_groups_for_object(self.layer, self.request.user, 'change_layer', 'viewer')
- self.initial_viewer_user_groups = kwargs['initial']['user_groups_viewer'] = [o.id for o in group_viewers]
+ self.initial_viewer_user_groups = kwargs['initial']['user_groups_viewer'] = self.get_initial_viewer_user_groups(self.layer)
self.initial_atomic_capabilitites['group']['change_layer'] = self.initial_viewer_user_groups
@@ -195,6 +206,9 @@ def get_context_data(self, **kwargs):
# Add initial atomic capabilities for widget.js
context['initial_atomic_capabilities'] = json.dumps(self.initial_atomic_capabilitites)
+ # Set multi variable to False
+ context['multilayer'] = False
+
return context
def get_initial_atomic_capabilitites(self, with_anonymous, editor_pk, editor2_pk):
@@ -247,7 +261,7 @@ def add_remove_atomic_permissions(self):
setPermissionUserObject(model.objects.get(pk=uid), self.layer, [ap], mode='remove')
def remove_from_atomic_permissions(self, context, u_g_id):
- """remove from self.atomic_capbilitites ugid"""
+ """remove from self.atomic_capbilities ugid"""
for ap in EDITING_ATOMIC_PERMISSIONS:
if u_g_id in self.atomic_capabilitites[context][ap]:
@@ -291,7 +305,7 @@ def form_valid(self, form):
for uid in toRemove:
setPermissionUserObject(User.objects.get(pk=uid), self.layer, ['change_layer'], mode='remove')
- # remove from atomic_capabilitites user id
+ # remove from atomic_capabilities user id
self.remove_from_atomic_permissions('user', uid)
# give permission to user groups viewers:
@@ -312,7 +326,7 @@ def form_valid(self, form):
for aid in to_remove:
setPermissionUserObject(AuhtGroup.objects.get(pk=aid), self.layer, ['change_layer'], mode='remove')
- # remove from atomic_capabilitites user id
+ # remove from atomic_capabilities user id
self.remove_from_atomic_permissions('group', aid)
# ADD/REMOVE atomic permissions
@@ -320,4 +334,158 @@ def form_valid(self, form):
- return super(ActiveEditingLayerView, self).form_valid(form)
\ No newline at end of file
+ return super(ActiveEditingLayerView, self).form_valid(form)
+
+
+class ActiveEditingMultiLayerView(ActiveEditingLayerView):
+ """
+ Activate/deactivate editing multi layer
+ """
+
+ form_class = ActiveEditingMultiLayerForm
+
+ def get_context_data(self, **kwargs):
+ context = super().get_context_data(**kwargs)
+
+ # Set multi variable to true
+ context['multilayer'] = True
+
+ return context
+
+ def get_form_kwargs(self):
+
+ # Bypass ActiveEditingLayerView get_from_kwargs method
+ kwargs = super(ActiveEditingLayerView, self).get_form_kwargs()
+
+ self.layer_model = apps.get_app_config(self.app_name).get_model('layer')
+
+ if 'data' in kwargs:
+ self.get_atomic_capabilities(kwargs['data'])
+
+ return kwargs
+
+ def add_remove_atomic_permissions(self, layer, with_anonymous=False, editor_pk=None, editor2_pk=None):
+ """ Add and remove atomic permissions for user and groups"""
+
+ initial_atomic_capabilitites = {}
+
+
+
+ for context in self.contexts:
+
+ # Initializze initial_atomic_capabilitites
+ initial_atomic_capabilitites[context] = {}
+
+ for ap in EDITING_ATOMIC_PERMISSIONS:
+
+ # Get initial atomic capabilities
+ # -------------------------------
+ if context == 'user':
+ viewers = get_viewers_for_object(layer, self.request.user, ap, with_anonymous=with_anonymous)
+ initial_atomic_capabilitites['user'][ap] = [int(o.id) for o in viewers
+ if o.id not in (editor_pk, editor2_pk)]
+ if context == 'group':
+ group_viewers = get_user_groups_for_object(layer, self.request.user, ap, 'viewer')
+ initial_atomic_capabilitites['group'][ap] = [o.id for o in group_viewers]
+
+ model = User if context == 'user' else AuhtGroup
+
+ to_remove = list(set(initial_atomic_capabilitites[context][ap]) -
+ set(self.atomic_capabilitites[context][ap]))
+ to_add = list(set(self.atomic_capabilitites[context][ap]) -
+ set(initial_atomic_capabilitites[context][ap]))
+
+ if to_add:
+ for uid in to_add:
+ setPermissionUserObject(model.objects.get(pk=uid), layer, [ap])
+
+ if to_remove:
+ for uid in to_remove:
+ setPermissionUserObject(model.objects.get(pk=uid), layer, [ap], mode='remove')
+
+ @transaction.atomic
+ def form_valid(self, form):
+
+ # Get current G3WEditingLayer instance
+ layers = form.cleaned_data['layers']
+ activated = {
+ str(a.layer_id): a for a in G3WEditingLayer.objects.filter(
+ app_name=self.app_name,
+ layer_id__in=layers)
+ }
+
+ scale = form.cleaned_data['scale']
+
+ for layer_pk in layers:
+
+ add_user_field = self.request.POST.get(f'add_user_field_{layer_pk}', None)
+ edit_user_field = self.request.POST.get(f'edit_user_field_{layer_pk}', None)
+
+ if form.cleaned_data['active']:
+
+ if layer_pk not in activated.keys():
+ activated[layer_pk] = G3WEditingLayer.objects.create(app_name=self.app_name,
+ layer_id=layer_pk,
+ edit_user_field=edit_user_field,
+ add_user_field=add_user_field,
+ scale=scale)
+ else:
+ activated[layer_pk].scale = scale
+ activated[layer_pk].add_user_field = add_user_field
+ activated[layer_pk].edit_user_field = edit_user_field
+ activated[layer_pk].save()
+ else:
+ if layer_pk in activated.keys():
+ activated[layer_pk].delete()
+
+ # Get layer and initial permissions
+ layer = self.layer_model.objects.get(pk=layer_pk)
+ with_anonymous, editor_pk, edito2_pk, initial_viewer_users = self.get_initial_viewer_users(layer)
+ initial_viewer_user_groups = self.get_initial_viewer_user_groups(layer)
+
+ # Give permission to viewers:
+ toAdd = toRemove = None
+ if activated.get(layer_pk) and activated.get(layer_pk).pk:
+ currentViewerUsers = [int(i) for i in form.cleaned_data['viewer_users']]
+ toRemove = list(set(initial_viewer_users) - set(currentViewerUsers))
+ toAdd = list(set(currentViewerUsers) - set(initial_viewer_users))
+ else:
+ if initial_viewer_users:
+ toRemove = initial_viewer_users
+
+ if toAdd:
+ for uid in toAdd:
+ setPermissionUserObject(User.objects.get(pk=uid), layer, ['change_layer'])
+
+ if toRemove:
+ for uid in toRemove:
+ setPermissionUserObject(User.objects.get(pk=uid), layer, ['change_layer'], mode='remove')
+
+ # Remove from atomic_capabilities user id
+ # self.remove_from_atomic_permissions('user', uid)
+
+ # Give permission to user groups viewers:
+ to_add = to_remove = None
+ if activated.get(layer_pk) and activated.get(layer_pk).pk:
+ current_user_groups_viewers = [int(i) for i in form.cleaned_data['user_groups_viewer']]
+ to_remove = list(set(initial_viewer_user_groups) - set(current_user_groups_viewers))
+ to_add = list(set(current_user_groups_viewers) - set(initial_viewer_user_groups))
+ else:
+ if initial_viewer_user_groups:
+ to_remove = initial_viewer_user_groups
+
+ if to_add:
+ for aid in to_add:
+ setPermissionUserObject(AuhtGroup.objects.get(pk=aid), layer, ['change_layer'])
+
+ if to_remove:
+ for aid in to_remove:
+ setPermissionUserObject(AuhtGroup.objects.get(pk=aid), layer, ['change_layer'], mode='remove')
+
+ # # remove from atomic_capabilities user id
+ # self.remove_from_atomic_permissions('group', aid)
+ #
+ # ADD/REMOVE atomic permissions
+ self.add_remove_atomic_permissions(layer, with_anonymous, editor_pk, edito2_pk)
+
+ return super(ActiveEditingLayerView, self).form_valid(form)
diff --git a/g3w-admin/qdjango/api/layers/serializers.py b/g3w-admin/qdjango/api/layers/serializers.py
index f1da1de9f..84fc50dc9 100644
--- a/g3w-admin/qdjango/api/layers/serializers.py
+++ b/g3w-admin/qdjango/api/layers/serializers.py
@@ -17,9 +17,18 @@
class LayerInfoSerializer(serializers.ModelSerializer):
+ def to_representation(self, instance):
+
+ ret = super().to_representation(instance)
+
+ # From str to python
+ ret['database_columns'] = eval(ret['database_columns'])
+
+ return ret
+
class Meta:
model = Layer
- fields = ['pk', 'name', 'title', 'origname', 'qgs_layer_id', 'layer_type']
+ fields = ['pk', 'name', 'title', 'origname', 'qgs_layer_id', 'layer_type', 'database_columns']
class LayerInfoUserSerializer(serializers.ModelSerializer):
diff --git a/g3w-admin/qdjango/api/layers/views.py b/g3w-admin/qdjango/api/layers/views.py
index cb0867e2f..96d3f87de 100644
--- a/g3w-admin/qdjango/api/layers/views.py
+++ b/g3w-admin/qdjango/api/layers/views.py
@@ -376,3 +376,15 @@ def get_queryset(self):
geometrytype__in=['Polygon', 'MultiPolygon']
)
return qs
+
+class LayerInfoView(generics.RetrieveAPIView):
+ """Return info about qdjango layer by pk"""
+
+ queryset = Layer.objects.all()
+ serializer_class = LayerInfoSerializer
+
+ def get_queryset(self):
+ qs = super().get_queryset()
+ if 'layer_id' in self.kwargs:
+ qs = Layer.objects.get(pk=self.kwargs['layer_id'])
+ return qs
diff --git a/g3w-admin/qdjango/apiurls.py b/g3w-admin/qdjango/apiurls.py
index 447abb635..d7adb6489 100644
--- a/g3w-admin/qdjango/apiurls.py
+++ b/g3w-admin/qdjango/apiurls.py
@@ -15,7 +15,8 @@
LayerAuthGroupInfoAPIView,
LayerStyleListView,
LayerStyleDetailView,
- LayerPolygonView
+ LayerPolygonView,
+ LayerInfoView
)
from .api.constraints.views import (
ConstraintExpressionRuleDetail,
@@ -355,4 +356,9 @@
name='qdjango-api-info-layer-authgroup'
),
+ path('api/info/layer//',
+ login_required(LayerInfoView.as_view()),
+ name='qdjango-api-info-layer'
+ ),
+
]
\ No newline at end of file
diff --git a/g3w-admin/qdjango/locale/it/LC_MESSAGES/django.po b/g3w-admin/qdjango/locale/it/LC_MESSAGES/django.po
index f0fae27b5..b44b03b6f 100644
--- a/g3w-admin/qdjango/locale/it/LC_MESSAGES/django.po
+++ b/g3w-admin/qdjango/locale/it/LC_MESSAGES/django.po
@@ -844,7 +844,7 @@ msgstr ""
#: templates/qdjango/ajax/layer_detail.html:20
#, fuzzy
#| msgid "Datasource"
-msgid "Datasoruce"
+msgid "Datasource"
msgstr "Sorgente dati"
#: templates/qdjango/ajax/layer_widgets.html:4
diff --git a/g3w-admin/qdjango/templates/qdjango/ajax/layer_detail.html b/g3w-admin/qdjango/templates/qdjango/ajax/layer_detail.html
index 2d5fb67d2..dec19b3f6 100644
--- a/g3w-admin/qdjango/templates/qdjango/ajax/layer_detail.html
+++ b/g3w-admin/qdjango/templates/qdjango/ajax/layer_detail.html
@@ -17,7 +17,7 @@ {% trans 'QGIS layer ID' %}:
{{ object.qgs_layer_id }}
- {% trans 'Datasoruce' %}:
+ {% trans 'Datasource' %}:
{{ object.datasource }}
diff --git a/g3w-admin/qdjango/templates/qdjango/layers_list.html b/g3w-admin/qdjango/templates/qdjango/layers_list.html
index 369a643a6..9e440c973 100644
--- a/g3w-admin/qdjango/templates/qdjango/layers_list.html
+++ b/g3w-admin/qdjango/templates/qdjango/layers_list.html
@@ -98,7 +98,21 @@ {% trans 'Project' %}
{% trans 'Structure' %}
-
+
+
+
+ {% trans 'Project layers actions' %}:
+
+
+ {% g3wadmin_project_layers_actions project 'qdjango' user as project_layers_actions %}
+
+ {% for action in project_layers_actions %}
+ {{ action }}
+ {% endfor %}
+
+
+
+
diff --git a/g3w-admin/qdjango/utils/models.py b/g3w-admin/qdjango/utils/models.py
index a2b8b7e0b..fe4f41188 100644
--- a/g3w-admin/qdjango/utils/models.py
+++ b/g3w-admin/qdjango/utils/models.py
@@ -24,7 +24,7 @@
def comparedbdatasource(ds1, ds2, layer_type='postgres'):
"""
Compare postgis/sqlite datasource bosed on dbname, host and table name
- :param ds1: qgis db datasoruce string from compare
+ :param ds1: qgis db datasource string from compare
:param ds2: qgis db datasource string to compare
:return: Boolean
"""
@@ -54,7 +54,7 @@ def get_widgets4layer(layer):
:param layer: Qdjango Layer model instance
:return: List or Querydict fo Widget models
"""
- from .structure import datasource2dict, qgsdatasoruceuri2dict
+ from .structure import datasource2dict, qgsdatasourceuri2dict
from qdjango.models import Widget
# different by layer type
diff --git a/g3w-admin/qdjango/utils/structure.py b/g3w-admin/qdjango/utils/structure.py
index f28ed111b..acac9fcf9 100644
--- a/g3w-admin/qdjango/utils/structure.py
+++ b/g3w-admin/qdjango/utils/structure.py
@@ -40,7 +40,7 @@ def get_schema_table(datasource_table):
return schema, table
-def qgsdatasoruceuri2dict(datasource: str) -> dict:
+def qgsdatasourceuri2dict(datasource: str) -> dict:
"""
From QgsDatasourceUri to dict
At now only for postgres type layer