Add macrogroup_id to group serializer. (#761) (#772)

* Add `macrogroup_id` to group serializer. (#761) * Add `macrogroup_id` to group serializer. * 🐛 Client g3w-suite/g3w-client#579 * ✨ Client g3w-suite/g3w-client#579 * ✨ Client g3w-suite/g3w-client@ebb57cd * Typo: fix 'nomacrogroup' filter. * Typo. * Fix testing. * 🐛 Client g3w-suite/g3w-client#590 --------- Co-authored-by: wlorenzetti <[email protected]> Co-authored-by: volterra79 <[email protected]> Co-authored-by: Raruto <[email protected]> (cherry picked from commit ee5486e) * ⬆️ Client ⬆️ Bump g3w-client v3.9.4 and g3w-client-plugin-qplotly v3.7.1 - https://github.com/g3w-suite/g3w-client/releases/tag/v3.9.4 - https://github.com/g3w-suite/g3w-client-plugin-qplotly/releases/tag/v3.7.1 * Fix for QGIS server >= 3.28 --------- Co-authored-by: volterra79 <[email protected]> Co-authored-by: wlorenzetti <[email protected]>
g3w-suite · Mar 4, 2024 · 963e730 · 963e730
1 parent c2d8ab7
commit 963e730
Show file tree

Hide file tree

Showing 5 changed files with 23 additions and 11 deletions.
diff --git a/g3w-admin/about/api/filters.py b/g3w-admin/about/api/filters.py
@@ -34,7 +34,7 @@ def filter_queryset(self, request, queryset, view):
 
 
 class UserProjectFilter(BaseFilterBackend):
-    """A filter backend for portal module for qdjango project"""
+    """A filter backend for about module for qdjango project"""
 
     def filter_queryset(self, request, queryset, view):
         """
@@ -47,20 +47,24 @@ def filter_queryset(self, request, queryset, view):
 
 
 class GroupProjectFilter(BaseFilterBackend):
-    """A filter backend for portal module for qdjango project , filter by group"""
+    """A filter backend for about module for qdjango project , filter by group"""
 
     def filter_queryset(self, request, queryset, view):
         """
         Return a filtered queryset by group_id
         """
+
         if 'group_id' in view.kwargs:
             queryset = queryset.filter(group_id=view.kwargs['group_id']).order_by('order')
 
+        if resolve(request.path_info).url_name == 'about-group-without-macrogroup-api-list':
+            queryset = queryset.filter(macrogroups__pk=None)
+
         return queryset
 
 
 class MacroGroupGroupFilter(BaseFilterBackend):
-    """A filter backend for portal module for group, filter by macrogroup"""
+    """A filter backend for about module for group, filter by macrogroup"""
 
     def filter_queryset(self, request, queryset, view):
         """
@@ -70,14 +74,14 @@ def filter_queryset(self, request, queryset, view):
             queryset = queryset.filter(macrogroups__pk=view.kwargs['macrogroup_id'])
 
         # check for group without macrogroup
-        if resolve(request.path_info).url_name == 'portal-group-without-macrogroup-api-list':
+        if resolve(request.path_info).url_name == 'about-group-without-macrogroup-api-list':
             queryset = queryset.filter(macrogroups__pk=None)
 
         return queryset
 
 
 class PanoramicProjectFilter(BaseFilterBackend):
-    """A filter backend for portal module for qdjango project , filter by not panoramic"""
+    """A filter backend for about module for qdjango project , filter by not panoramic"""
 
     def filter_queryset(self, request, queryset, view):
 

diff --git a/g3w-admin/about/tests/test_api.py b/g3w-admin/about/tests/test_api.py
@@ -92,6 +92,11 @@ def setUpTestData(cls):
 
         cls.project_group2.save()
 
+        cls.project_group3 = CoreGroup(name='Group3', title='Group3', header_logo_img='',
+                                       srid=G3WSpatialRefSys.objects.get(auth_srid=3857))
+
+        cls.project_group3.save()
+
         # create macrogroups
         cls.macrogroup = MacroGroup(title='Macrogroup1', logo_img='macrogroup.png')
         cls.macrogroup.save()
@@ -173,7 +178,7 @@ def test_group(self):
         response = client.get(url)
         self.assertEqual(response.status_code, 200)
         jcontent = json.loads(response.content)
-        self.assertEqual(len(jcontent), 2)
+        self.assertEqual(len(jcontent), 3)
         feature = jcontent[0]
         self.assertIn('edit_url', feature)
         group = CoreGroup.objects.filter(pk=feature['id'])[0]
@@ -318,7 +323,7 @@ def test_macrogroup(self):
         response = client.get(url)
         self.assertEqual(response.status_code, 200)
         jcontent = json.loads(response.content)
-        self.assertEqual(len(jcontent), 2)
+        self.assertEqual(len(jcontent), 1)
 
         # ad new group without macrogroup
         new_group = CoreGroup(name='Group33', title='Group33', header_logo_img='',
@@ -328,8 +333,8 @@ def test_macrogroup(self):
         response = client.get(url)
         self.assertEqual(response.status_code, 200)
         jcontent = json.loads(response.content)
-        self.assertEqual(len(jcontent), 3)
-        self.assertEqual(jcontent[2]['name'], 'Group33')
+        self.assertEqual(len(jcontent), 2)
+        self.assertEqual(jcontent[1]['name'], 'Group33')
 
         client.logout()
 

diff --git a/g3w-admin/client/static/client/js/app.min.js b/g3w-admin/client/static/client/js/app.min.js
diff --git a/g3w-admin/core/api/serializers.py b/g3w-admin/core/api/serializers.py
@@ -273,6 +273,9 @@ def to_representation(self, instance):
                 mapcontrol.name: options
             })
 
+        # Macrogroups
+        ret['macrogroup_id'] = [macrogroup.id for macrogroup in instance.macrogroups.all()]
+
         return ret
 
     class Meta:

diff --git a/g3w-admin/qplotly/static/qplotly/js/plugin.js b/g3w-admin/qplotly/static/qplotly/js/plugin.js