Exlude layer from TOC (#841)

* Restyling not show capabilities in layer list page. * Exclude from toc workflow * Exclude from toc workflow * Add toc property to layertree * Fix tests * Fix tests * ✨ Client g3w-suite/g3w-client@4b531f4 * exclude_from_toc nullable for retro compatibility * fro retro compatibility * ✨ Client g3w-suite/g3w-client@ff575d8 * i18n * Update g3wadmin.min.css * Update i18n --------- Co-authored-by: wlorenzetti <[email protected]> Co-authored-by: volterra79 <[email protected]> Co-authored-by: Raruto <[email protected]>
g3w-suite · May 9, 2024 · 8aea8ea · 8aea8ea
1 parent a00a076
commit 8aea8ea
Show file tree

Hide file tree

Showing 15 changed files with 303 additions and 202 deletions.
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/client/static/client/js/app.min.js.map b/g3w-admin/client/static/client/js/app.min.js.map
diff --git a/g3w-admin/client/tests/test_api.py b/g3w-admin/client/tests/test_api.py
@@ -208,10 +208,10 @@ def testClientConfigApiView(self):
         resp = json.loads(response.content)
 
         self.assertEqual(resp["layerstree"], [
-            {'visible': True, 'expanded': False, 'name': 'spatialite_points',
+            {'toc': True, 'visible': True, 'expanded': False, 'name': 'spatialite_points',
              'id': 'spatialite_points20190604101052075'},
-            {'visible': True, 'expanded': False, 'name': 'world', 'id': 'world20181008111156525'},
-            {'visible': True, 'expanded': True, 'name': 'bluemarble', 'id': 'bluemarble20181008111156906'}])
+            {'toc': True, 'visible': True, 'expanded': False, 'name': 'world', 'id': 'world20181008111156525'},
+            {'toc': True, 'visible': True, 'expanded': True, 'name': 'bluemarble', 'id': 'bluemarble20181008111156906'}])
         self.assertEqual(resp["search"], [])
         self.assertFalse(resp["wms_use_layer_ids"])
         self.assertEqual(resp["qgis_version"], "2.18.16")

diff --git a/g3w-admin/core/static/css/g3wadmin.css b/g3w-admin/core/static/css/g3wadmin.css
@@ -190,7 +190,8 @@ h5 small {
     font-size: 150%;
 }
 
-div.vector-download  li {
+div.vector-download  li,
+div.not-show  li {
     list-style: none;
     box-sizing: border-box;
     display: list-item;
@@ -199,9 +200,16 @@ div.vector-download  li {
     padding-top: 6px;
 }
 
-div.vector-download > ul.menu {
+div.vector-download > ul.menu,
+div.not-show > ul.menu{
     padding: 0;
 }
+/*
+div.not-show > ul.menu {
+    width: 100px;
+}
+*/
+
 
 .group-abstract-action, .project-abstract-action {
     margin-left:-10px;

diff --git a/g3w-admin/core/static/dist/css/g3wadmin.min.css b/g3w-admin/core/static/dist/css/g3wadmin.min.css
diff --git a/g3w-admin/qdjango/api/projects/serializers.py b/g3w-admin/qdjango/api/projects/serializers.py
@@ -498,6 +498,9 @@ def readLeaf(layer, container):
                 layer_serialized_data['multilayer'] = meta_layer.getCurrentByLayer(
                     layer_serialized_data)
 
+                # Check if layer is exclude from toc
+                layer['toc'] = not layer_serialized_data['exclude_from_toc']
+
                 # check for vectorjoins and add to project relations
                 if layer_serialized_data['vectorjoins']:
                     ret['relations'] += self.get_map_layers_relations_from_vectorjoins(
@@ -681,6 +684,7 @@ class Meta:
             'servertype',
             'vectorjoins',
             'exclude_from_legend',
+            'exclude_from_toc',
             'not_show_attributes_table',
             'download',
             'download_xls',

diff --git a/g3w-admin/qdjango/locale/de/LC_MESSAGES/djangojs.mo b/g3w-admin/qdjango/locale/de/LC_MESSAGES/djangojs.mo
diff --git a/g3w-admin/qdjango/locale/it/LC_MESSAGES/django.mo b/g3w-admin/qdjango/locale/it/LC_MESSAGES/django.mo