Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add edit_url and layers_url attribute into initial client API response (ref: group-project-map-config) #706

Merged
merged 7 commits into from
Jan 25, 2024
Merged
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
50 changes: 49 additions & 1 deletion g3w-admin/client/tests/test_api.py
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
from django.test import override_settings
from django.core.files import File
from django.core.cache import cache
from guardian.shortcuts import remove_perm
from guardian.shortcuts import remove_perm, assign_perm, get_anonymous_user
from qdjango.models import Project
from qdjango.utils.data import QgisProject
from core.tests.base import CoreTestBase
Expand All @@ -38,6 +38,8 @@

@override_settings(MEDIA_ROOT=PROJECTS_PATH)
@override_settings(DATASOURCE_PATH=DATASOURCE_PATH)
@override_settings(CLIENT_OWS_METHOD='GET')
@override_settings(G3W_CLIENT_SEARCH_ENDPOINT='ows')
class ClientApiTest(CoreTestBase):
"""Test client API"""

Expand Down Expand Up @@ -418,6 +420,52 @@ def testClientConfigApiView(self):
'extent': [-180.0, -90.0, 180.0, 90.0]
})

# Check for edit_url and layers_url
self.assertTrue('edit_url'in resp)
self.assertEqual(resp['edit_url'], '/en/qdjango/gruppo-1/projects/update/un-progetto/')
self.assertTrue('layers_url' in resp)
self.assertEqual(resp['layers_url'], '/en/qdjango/gruppo-1/projects/un-progetto/layers/')

# Test ProjectPermission
# ------------------------------------------------------------
url = reverse('group-project-map-config', args=['gruppo-1', 'qdjango', '1'])

# Anonymouse user
resp = self.client.get(url)
self.assertEqual(resp.status_code, 403)

assign_perm('view_project', get_anonymous_user(), self.prj_test)

resp = self.client.get(url)
self.assertEqual(resp.status_code, 200)

self.assertFalse('edit_url' in resp)
self.assertFalse('layers_url' in resp)

assign_perm('view_project', self.test_viewer1, self.prj_test)
self.client.login(username=self.test_viewer1.username, password=self.test_viewer1.username)

resp = self.client.get(url)
self.assertEqual(resp.status_code, 200)

self.assertFalse('edit_url' in resp)
self.assertFalse('layers_url' in resp)

self.client.logout()

assign_perm('view_project', self.test_editor1, self.prj_test)
assign_perm('change_project', self.test_editor1, self.prj_test)
self.client.login(username=self.test_editor1.username, password=self.test_editor1.username)

resp = self.client.get(url)
self.assertEqual(resp.status_code, 200)

self.assertFalse('edit_url' in resp)
self.assertFalse('layers_url' in resp)

self.client.logout()


# Test ProjectIsActivePermission
# ------------------------------------------------------------

Expand Down
15 changes: 15 additions & 0 deletions g3w-admin/qdjango/api/projects/serializers.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
from django.http.request import QueryDict
from django.conf import settings
from django.utils.translation import ugettext_lazy as _, get_language
from django.urls import reverse
from rest_framework import serializers
from rest_framework.fields import empty
from owslib.wms import WebMapService
Expand Down Expand Up @@ -598,6 +599,20 @@ def readLeaf(layer, container):
# reset tokenfilter by session
self.reset_filtertoken()

# add edit url if user has grant
if self.request.user.has_perm('qdjango.change_project', instance):
ret['edit_url'] = reverse('qdjango-project-update', kwargs={
'group_slug': instance.group.slug,
'slug': instance.slug
})

# add layers url if user has grant
if self.request.user.has_perm('qdjango.change_project', instance):
ret['layers_url'] = reverse('qdjango-project-layers-list', kwargs={
'group_slug': instance.group.slug,
'project_slug': instance.slug
})

Comment on lines +602 to +615
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@wlorenzetti @volterra79 if you have better property names, just say...

return ret

class Meta:
Expand Down
Loading