⬆️Bump g3w-client v3.10.6

README.md

@@ -15,9 +15,10 @@ Software releases follow theese main branches as described in the compatibility
 
 | Branch     | Python         | Django         | QGIS          | [client]     | First release | Status         |
 |------------|----------------|----------------|---------------|--------------|---------------|----------------|
-| [dev]      | 3.10           | 3.2            | 3.34          | dev          | Unreleased    | ⚠️️ Unstable     |
-| [v.3.7.x]  | 3.10           | 3.2            | 3.34          | 3.9.6        | Dec 2023      | 🪲️ Bug fixing   |
-| [v.3.6.x]  | 3.10           | 3.2            | 3.28          | 3.8.15       | May 2023      | 🪲️ Bug fixing   |
+| [dev]      | 3.10           | 3.2            | 3.34          | dev          | Unreleased    | ⚠️️ Unstable    |
+| [v.3.8.x]  | 3.10           | 3.2            | 3.34          | 3.10.5       | Nov 2024      | 🪲️ Bug fixing  |
+| [v.3.7.x]  | 3.10           | 3.2            | 3.34          | 3.9.6        | Dec 2023      | 🪲️ Bug fixing  |
+| [v.3.6.x]  | 3.10           | 3.2            | 3.28          | 3.8.15       | May 2023      | 🚨 End of Life |
 | [v.3.5.x]  | 3.10           | 2.2            | 3.22          | 3.7          | Nov 2022      | 🚨 End of Life |
 | [v.3.4.x]  | 3.8            | 2.2            | 3.22          | 3.4          | Mar 2022      | 🚨 End of Life |
 | [v.3.3.x]  | 3.6            | 2.2            | 3.16          | 3.3          | Sep 2021      | 🚨 End of Life | 
@@ -28,6 +29,7 @@ Software releases follow theese main branches as described in the compatibility
 | [py2]      | 2.7            | 1.11           | [🔗]          |              |               | 🚨 End of Life |
 
 [dev]: https://github.com/g3w-suite/g3w-admin/tree/dev
+[v.3.8.x]: https://github.com/g3w-suite/g3w-admin/tree/v.3.8.x
 [v.3.7.x]: https://github.com/g3w-suite/g3w-admin/tree/v.3.7.x
 [v.3.6.x]: https://github.com/g3w-suite/g3w-admin/tree/v.3.6.x
 [v.3.5.x]: https://github.com/g3w-suite/g3w-admin/tree/v.3.5.x
@@ -220,7 +222,7 @@ Depending on the component you want to translate you can start by consulting one
 
 **Compatibile with:**
 [![Django version](https://img.shields.io/badge/Django-3.2-1EB300.svg?style=flat)](https://www.djangoproject.com/download/)
-[![QGIS version](https://img.shields.io/badge/QGIS%20LTR-3.28-1EB300.svg?style=flat)](https://www.qgis.org/en/site/forusers/download.html)
+[![QGIS version](https://img.shields.io/badge/QGIS%20LTR-3.34-1EB300.svg?style=flat)](https://www.qgis.org/en/site/forusers/download.html)
 
 ---
 

ci_scripts/Dockerfile.deps

@@ -23,11 +23,10 @@ RUN apt-get update && apt install -y \
     xvfb
 
 # PyQGIS latest version
-RUN wget -qO - https://qgis.org/downloads/qgis-2022.gpg.key | \
-    gpg --no-default-keyring --keyring gnupg-ring:/etc/apt/trusted.gpg.d/qgis-archive.gpg --import && \
-    chmod a+r /etc/apt/trusted.gpg.d/qgis-archive.gpg && \
-    echo "deb [arch=amd64] https://qgis.org/ubuntu jammy main" >> /etc/apt/sources.list && \
-    apt update && apt install -y python3-qgis qgis-server
+RUN curl -sS https://download.qgis.org/downloads/qgis-archive-keyring.gpg > /etc/apt/keyrings/qgis-archive-keyring.gpg && \
+    echo "deb [signed-by=/etc/apt/keyrings/qgis-archive-keyring.gpg] https://qgis.org/ubuntu jammy main" | \
+    tee /etc/apt/sources.list.d/qgis.list && \
+    apt-get update && apt-get install -y python3-qgis qgis-server
 
 # Yarn
 

ci_scripts/Dockerfile.ltr.deps

@@ -22,12 +22,11 @@ RUN apt-get update && apt install -y \
     dirmngr \
     xvfb
 
-# PyQGIS 3.28
-RUN wget -qO - https://qgis.org/downloads/qgis-2022.gpg.key | \
-    gpg --no-default-keyring --keyring gnupg-ring:/etc/apt/trusted.gpg.d/qgis-archive.gpg --import && \
-    chmod a+r /etc/apt/trusted.gpg.d/qgis-archive.gpg && \
-    echo "deb [arch=amd64] https://qgis.org/ubuntu-ltr jammy main" >> /etc/apt/sources.list && \
-    apt update && apt install -y python3-qgis qgis-server
+# PyQGIS
+RUN curl -sS https://download.qgis.org/downloads/qgis-archive-keyring.gpg > /etc/apt/keyrings/qgis-archive-keyring.gpg && \
+    echo "deb [signed-by=/etc/apt/keyrings/qgis-archive-keyring.gpg] https://qgis.org/ubuntu-ltr jammy main" | \
+    tee /etc/apt/sources.list.d/qgis.list && \
+    apt-get update && apt-get install -y python3-qgis qgis-server
 
 # Yarn
 RUN curl -sS https://dl.yarnpkg.com/debian/pubkey.gpg | apt-key add - && \

ci_scripts/setup_suite.sh

@@ -44,7 +44,10 @@ if [ ! -e ${SETUP_DONE_FILE} ]; then
     ls ${PROJECTS_DIR} || mkdir ${PROJECTS_DIR}
     ls ${DATASOURCE_PATH} || mkdir ${DATASOURCE_PATH}
 
-    wait-for-it -h ${G3WSUITE_POSTGRES_HOST:-postgis} -p ${G3WSUITE_POSTGRES_PORT:-5432} -t 60
+    until pg_isready -h ${G3WSUITE_POSTGRES_HOST:-postgis} -p ${G3WSUITE_POSTGRES_PORT:-5432}; do
+      echo "wait 30s until is ready"
+      sleep 30;
+    done
 
     pushd .
     cd ${DJANGO_DIRECTORY}/core/static

docker-compose.latest.yml

@@ -1,6 +1,4 @@
 # Use QGIS latest release
-
-version: "3"
 services:
   postgis:
     image: g3wsuite/postgis:11.0-2.5

docker-compose.ltr.yml

@@ -1,4 +1,3 @@
-version: '3'
 services:
   postgis:
     image: g3wsuite/postgis:11.0-2.5

g3w-admin/base/settings/base.py

@@ -364,7 +364,7 @@
 BLEACH_ALLOWED_TAGS = ['p', 'b', 'i', 'u', 'em', 'strong', 'a', 'br', 'table', 'tr', 'td', 'th', 'b', 'ul', 'li', 'ol',
                        'div', 'h1', 'h2', 'h3', 'h4', 'h5', 'pre', 'blockquote', 'tbody', 'theader', 'tfooter', 'span']
 BLEACH_STRIP_TAGS = True
-BLEACH_ALLOWED_ATTRIBUTES = ['href', 'title', 'style', 'src']
+BLEACH_ALLOWED_ATTRIBUTES = ['href', 'title', 'style', 'src', 'target']
 BLEACH_ALLOWED_STYLES = [
     'background-color', 'color', 'font-size'
 ]

g3w-admin/core/api/base/views.py

@@ -428,6 +428,18 @@ def response_config_mode(self, request):
             'fields': fields,
         }
 
+        # Filter fields by user
+        if self.request.user:
+            visiblefields = self.layer.visible_fields_for_user(self.request.user)
+            if len(visiblefields) != len(vector_params['fields']):
+                newfields = []
+                for f in vector_params['fields']:
+                    if f['name'] in visiblefields:
+                        newfields.append(f)
+
+                if newfields:
+                    vector_params['fields'] = newfields
+
         # post_create_maplayerattributes signal
         post_create_maplayerattributes.send(
             self, layer=self.layer, vector_params=vector_params)

g3w-admin/core/api/filters.py

@@ -143,8 +143,10 @@ def apply_filter(self, request, metadata_layer, qgis_feature_request, view):
                 if not self._is_valid_field(qgis_layer, ordering, view):
                     continue
 
+                # Because the fields inside a QGIS expression must be declared inside
+                # the expression string with the double brackets ("field_name")
                 ordering_rules.append(QgsFeatureRequest.OrderByClause(
-                    ordering, ascending))
+                    f'"{ordering}"', ascending))
 
             if ordering_rules:
                 order_by = QgsFeatureRequest.OrderBy(ordering_rules)

g3w-admin/core/utils/structure.py

@@ -8,7 +8,7 @@
 import copy
 
 from qgis.core import QgsFieldConstraints, Qgis, QgsExpression, QgsExpressionNode
-from qgis.PyQt.QtCore import QVariant, QDate, QDateTime
+from qgis.PyQt.QtCore import QVariant, QDate, QDateTime, NULL
 
 # relations data type
 RELATIONS_ONE_TO_ONE = 'ONE'
@@ -128,7 +128,7 @@ def editingFormField(fieldName, type=FIELD_TYPE_STRING, editable=True, required=
     if required:
         ret['validate']['required'] = True
 
-    if 'default' in kwargs and kwargs['default']:
+    if 'default' in kwargs and kwargs['default'] is not None:
         ret['input']['options']['default'] = kwargs['default']
 
     if inputType in (FORM_FIELD_TYPE_LAYERPICKER, ) and 'pickerdata' in kwargs:
@@ -269,7 +269,7 @@ def mapLayerAttributesFromQgisLayer(qgis_layer, **kwargs):
 
                 # default value for editing from qgis_layer
                 if 'default' not in kwargs:
-                    default_value = qgis_layer.defaultValue(field_index) if qgis_layer.defaultValue(field_index) \
+                    default_value = qgis_layer.defaultValue(field_index) if qgis_layer.defaultValue(field_index) not in (None, NULL) \
                         else None
                 else:
                     default_value = kwargs['default']

g3w-admin/editing/api/base/views.py

@@ -27,7 +27,7 @@
                             EDITING_POST_DATA_UPDATED)
 from editing.utils import LayerLock
 from editing.utils.data import clear_session_for_uploaded_files
-from qdjango.apps import get_qgs_project
+from qdjango.apps import get_qgs_project, remove_project_from_cache
 from qdjango.models import Layer
 from qdjango.utils.data import QGIS_LAYER_TYPE_NO_GEOM
 from qdjango.utils.validators import feature_validator
@@ -526,8 +526,8 @@ def response_commit_mode(self, request):
         qgis_layer = self.metadata_layer.qgis_layer
 
         # Get the project
-        qgis_project = get_qgs_project(Layer.objects.get(
-            pk=self.metadata_layer.layer_id).project.qgis_file.path)
+        project = Layer.objects.get(pk=self.metadata_layer.layer_id).project
+        qgis_project = get_qgs_project(project.qgis_file.path)
 
         # Check if we have transaction groups activated
         # Performs all operations in the editing buffer if we have transactions
@@ -653,9 +653,13 @@ def save_relation(post_relation_data, referencing_layer, ref_insert_ids) -> None
         except:
             pass
 
-        # clear file uploaded and reset session
+        # Clear file uploaded and reset session
         clear_session_for_uploaded_files(request)
 
+        # Invalidate /api/config cache e invalidate QGIS project cache
+        project.invalidate_cache()
+        qgis_project.read(project.qgis_file.path)
+
 
     def response_unlock_mode(self, request):
         """