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.

Sign up for GitHub

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

[Backport master] Don't alter the URL when adding the query #11778

Open
wants to merge 5 commits into
base: master
Choose a base branch
from
Open

[Backport master] Don't alter the URL when adding the query #11778

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
9d9c2c8
Don't alter the URL when adding the query
sbrunner Mar 4, 2025
d0cfc73
Update QGIS lr-debug dpkg versions list
geo-ghci-int[bot] Mar 5, 2025
9933b75
Update QGIS master dpkg versions list
geo-ghci-int[bot] Mar 5, 2025
da00c46
Update QGIS ltr dpkg versions list
geo-ghci-int[bot] Mar 5, 2025
ded72bc
Update QGIS lr dpkg versions list
geo-ghci-int[bot] Mar 5, 2025
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
4 changes: 4 additions & 0 deletions ci/dpkg-versions.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1401,6 +1401,7 @@ camptocamp/geomapfish-qgisserver:gmflatest-qgislr:
ubuntu_24_04/tar: 1.35+dfsg-3build1
ubuntu_24_04/tzdata: 2024b-0ubuntu0.24.04.1
ubuntu_24_04/ubuntu-keyring: 2023.11.28.1
ubuntu_24_04/unminimize: 0.2.1
ubuntu_24_04/unzip: 6.0-28ubuntu4.1
ubuntu_24_04/util-linux: 2.39.3-9ubuntu6.2
ubuntu_24_04/x11-common: 1:7.7+23ubuntu3
Expand Down Expand Up @@ -1818,6 +1819,7 @@ camptocamp/geomapfish-qgisserver:gmflatest-qgislr-debug:
ubuntu_24_04/tzdata: 2024b-0ubuntu0.24.04.1
ubuntu_24_04/ubuntu-keyring: 2023.11.28.1
ubuntu_24_04/ucf: 3.0043+nmu1
ubuntu_24_04/unminimize: 0.2.1
ubuntu_24_04/unzip: 6.0-28ubuntu4.1
ubuntu_24_04/util-linux: 2.39.3-9ubuntu6.2
ubuntu_24_04/x11-common: 1:7.7+23ubuntu3
Expand Down Expand Up @@ -2227,6 +2229,7 @@ camptocamp/geomapfish-qgisserver:gmflatest-qgisltr:
ubuntu_24_04/tar: 1.35+dfsg-3build1
ubuntu_24_04/tzdata: 2024b-0ubuntu0.24.04.1
ubuntu_24_04/ubuntu-keyring: 2023.11.28.1
ubuntu_24_04/unminimize: 0.2.1
ubuntu_24_04/unzip: 6.0-28ubuntu4.1
ubuntu_24_04/util-linux: 2.39.3-9ubuntu6.2
ubuntu_24_04/x11-common: 1:7.7+23ubuntu3
Expand Down Expand Up @@ -2636,6 +2639,7 @@ camptocamp/geomapfish-qgisserver:gmflatest-qgismaster:
ubuntu_24_04/tar: 1.35+dfsg-3build1
ubuntu_24_04/tzdata: 2024a-3ubuntu1.1
ubuntu_24_04/ubuntu-keyring: 2023.11.28.1
ubuntu_24_04/unminimize: 0.2.1
ubuntu_24_04/unzip: 6.0-28ubuntu4.1
ubuntu_24_04/util-linux: 2.39.3-9ubuntu6.1
ubuntu_24_04/x11-common: 1:7.7+23ubuntu3
Expand Down
3 changes: 2 additions & 1 deletion geoportal/c2cgeoportal_geoportal/views/theme.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Copyright (c) 2011-2024, Camptocamp SA
# Copyright (c) 2011-2025, Camptocamp SA
# All rights reserved.

# Redistribution and use in source and binary forms, with or without
Expand Down Expand Up @@ -899,6 +899,7 @@ async def _wfs_get_features_type(
) -> tuple[xml.etree.ElementTree.Element | None, set[str]]: # pylint: disable=c-extension-no-member
errors = set()

wfs_url = wfs_url.clone()
wfs_url.add_query(
{
"SERVICE": "WFS",
Expand Down
6 changes: 3 additions & 3 deletions geoportal/tests/functional/test_themes_ogc_server_cache_clean.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Copyright (c) 2022-2024, Camptocamp SA
# Copyright (c) 2022-2025, Camptocamp SA
# All rights reserved.

# Redistribution and use in source and binary forms, with or without
Expand Down Expand Up @@ -274,7 +274,7 @@ def test_ogc_server_cache_clean(self) -> None:
"c2cgeoportal_geoportal.lib|_get_intranet_networks",
}
assert set(self.ogc_cache.keys()) == {
"c2cgeoportal_geoportal.views.theme|_get_features_attributes_cache|http://mapserver:8080/?SERVICE=WFS&VERSION=1.0.0&REQUEST=DescribeFeatureType&ROLE_IDS=0&USER_ID=0|__test_ogc_server",
"c2cgeoportal_geoportal.views.theme|_get_features_attributes_cache|http://mapserver:8080/|__test_ogc_server",
f"c2cgeoportal_geoportal.views.theme|build_web_map_service|{ogc_server.id}",
"c2cgeoportal_geoportal.views.theme|do_get_http_cached|http://mapserver:8080/?SERVICE=WFS&VERSION=1.0.0&REQUEST=DescribeFeatureType&ROLE_IDS=0&USER_ID=0",
"c2cgeoportal_geoportal.views.theme|do_get_http_cached|http://mapserver:8080/?SERVICE=WMS&VERSION=1.1.1&REQUEST=GetCapabilities&ROLE_IDS=0&USER_ID=0",
Expand Down Expand Up @@ -314,7 +314,7 @@ def test_ogc_server_cache_clean(self) -> None:
"c2cgeoportal_geoportal.lib|_get_intranet_networks",
}
assert set(self.ogc_cache.keys()) == {
"c2cgeoportal_geoportal.views.theme|_get_features_attributes_cache|http://mapserver:8080/?SERVICE=WFS&VERSION=1.0.0&REQUEST=DescribeFeatureType&ROLE_IDS=0&USER_ID=0|__test_ogc_server",
"c2cgeoportal_geoportal.views.theme|_get_features_attributes_cache|http://mapserver:8080/|__test_ogc_server",
f"c2cgeoportal_geoportal.views.theme|build_web_map_service|{ogc_server.id}",
"c2cgeoportal_geoportal.views.theme|do_get_http_cached|http://mapserver:8080/?SERVICE=WFS&VERSION=1.0.0&REQUEST=DescribeFeatureType&ROLE_IDS=0&USER_ID=0",
"c2cgeoportal_geoportal.views.theme|do_get_http_cached|http://mapserver:8080/?SERVICE=WMS&VERSION=1.1.1&REQUEST=GetCapabilities&ROLE_IDS=0&USER_ID=0",
Expand Down
Loading