c2cgeoportal-geoportal 2.8.1.137__py2.py3-none-any.whl → 2.8.1.139__py2.py3-none-any.whl

c2cgeoportal_geoportal/views/pdfreport.py

@@ -1,4 +1,4 @@
-# Copyright (c) 2011-2023, Camptocamp SA
+# Copyright (c) 2011-2024, Camptocamp SA
 # All rights reserved.
 
 # Redistribution and use in source and binary forms, with or without
@@ -106,14 +106,14 @@ class PdfReport(OGCProxy):
         self.layername = self.request.matchdict["layername"]
         layer_config = self.config["layers"].get(self.layername)
 
+        if layer_config is None:
+            raise HTTPBadRequest("Layer not found: " + self.layername)
+
         multiple = layer_config.get("multiple", False)
         ids = self.request.matchdict["ids"]
         if multiple:
             ids = ids.split(",")
 
-        if layer_config is None:
-            raise HTTPBadRequest("Layer not found")
-
         features_ids = (
             [self.layername + "." + id_ for id_ in ids] if multiple else [self.layername + "." + ids]
         )

c2cgeoportal_geoportal/views/theme.py

@@ -1,4 +1,4 @@
-# Copyright (c) 2011-2023, Camptocamp SA
+# Copyright (c) 2011-2024, Camptocamp SA
 # All rights reserved.
 
 # Redistribution and use in source and binary forms, with or without
@@ -383,8 +383,6 @@ class Theme:
         layer_info = {"id": layer.id, "name": layer.name, "metadata": self._get_metadata_list(layer, errors)}
         if re.search("[/?#]", layer.name):
             errors.add(f"The layer has an unsupported name '{layer.name}'.")
-        if isinstance(layer, main.LayerWMS) and re.search("[/?#]", layer.layer):
-            errors.add(f"The layer has an unsupported layers '{layer.layer}'.")
         if layer.geo_table:
             errors |= self._fill_editable(layer_info, layer)
         if mixed:

{c2cgeoportal_geoportal-2.8.1.137.dist-info → c2cgeoportal_geoportal-2.8.1.139.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: c2cgeoportal-geoportal
-Version: 2.8.1.137
+Version: 2.8.1.139
 Summary: c2cgeoportal geoportal
 Home-page: https://github.com/camptocamp/c2cgeoportal/
 Author: Camptocamp

{c2cgeoportal_geoportal-2.8.1.137.dist-info → c2cgeoportal_geoportal-2.8.1.139.dist-info}/RECORD

@@ -161,14 +161,14 @@ c2cgeoportal_geoportal/views/login.py,sha256=H4BCgOrhlbx34g5J1Sx8SdpoEoRCyL6PFRv
 c2cgeoportal_geoportal/views/mapserverproxy.py,sha256=LZRr86YerMJElSkQvfBX2aBMCoAdVyOPoFu3WzfaaeE,8167
 c2cgeoportal_geoportal/views/memory.py,sha256=nb2repOnil0PdziEjCLOZ-84LFKLkdAlKTnnMQoXDdA,3627
 c2cgeoportal_geoportal/views/ogcproxy.py,sha256=xnbrLpB8ZZSU-P1_aM_9LZeFr7GJzbePB05Ls6tluTU,5231
-c2cgeoportal_geoportal/views/pdfreport.py,sha256=0Y6--3W3dI7a9QfMgNbPNp3wMCFN9Im7AxWAo_SJzo8,9576
+c2cgeoportal_geoportal/views/pdfreport.py,sha256=jRXOZxNwB2uMsFFNaUOb3Axc1W_ZW00mQ9EYRoENppE,9595
 c2cgeoportal_geoportal/views/printproxy.py,sha256=0BzC6yFSg7vC_V21QKg1fArA9c0-JFl6-Kig9p-iZ9g,5909
 c2cgeoportal_geoportal/views/profile.py,sha256=WOjnkLcL3nakQG0t2Zj6M0FWyG3T874nn7MXaa1Dl18,5394
 c2cgeoportal_geoportal/views/proxy.py,sha256=r61TJd-GuSsGkzS98snO8owU3cDxbYnksL9-ux9bK7I,10421
 c2cgeoportal_geoportal/views/raster.py,sha256=zdwXumFZZNx1Gxlqy_s_6Cm8l50vN6CUMkXYHsbWIdI,7567
 c2cgeoportal_geoportal/views/resourceproxy.py,sha256=Wxzb0HkWQtL5JZmbNFfTP9-m83vKImsURGIotC3qbXc,3181
 c2cgeoportal_geoportal/views/shortener.py,sha256=EP2geo-9hfce0ZQ6kzwpwnOb3ruGY2KwxBDtepJKYQI,6205
-c2cgeoportal_geoportal/views/theme.py,sha256=hD2kZ8K_MigIRgwacOsuDXo4vgmFWL4DpJhQokQnYyk,52857
+c2cgeoportal_geoportal/views/theme.py,sha256=BHsvtuWqTqlpy1eyvOH5h9oGLYgdo4cuf1qdJTAiBTQ,52696
 c2cgeoportal_geoportal/views/tinyowsproxy.py,sha256=cfWyZc4mn003TF7XY03NC2S8svZoUWHScrIaS9i99Cc,7831
 c2cgeoportal_geoportal/views/vector_tiles.py,sha256=jerhFjx3_qImXz0a3eQI4FLSSe0CGmkjSt6pAXzzxUg,3460
 tests/__init__.py,sha256=KxmbgvRWDSJoEDH1cXnDIjbfBsgCzs2KdkTPuzYMq84,3826
@@ -184,8 +184,8 @@ tests/test_mapserverproxy_route_predicate.py,sha256=SzILSSzIuilzIkUYVPZiVzLwW1du
 tests/test_raster.py,sha256=82NJ2MXgZlMqs0ytN-VgNw376iURdk4PkAg__dyh5ns,11948
 tests/test_wmstparsing.py,sha256=xjA8nJuXFl3H5Bfs4sJw_8qX8E8qvAALK7Hs2-DTP2A,9054
 tests/xmlstr.py,sha256=rkTKSU4FGjupBKLx75H8o-goB0KbQrxDvdpc6xVX_uQ,5985
-c2cgeoportal_geoportal-2.8.1.137.dist-info/METADATA,sha256=84cf_Ekbcr9YA8R3SDA0WhD21wj7FYN21i5GW4KxNDk,2172
-c2cgeoportal_geoportal-2.8.1.137.dist-info/WHEEL,sha256=a-zpFRIJzOq5QfuhBzbhiA1eHTzNCJn8OdRvhdNX0Rk,110
-c2cgeoportal_geoportal-2.8.1.137.dist-info/entry_points.txt,sha256=w0xGr1Bo8q5GBFiP4JgqbSIg-bNhG7bsGoEaGSTfzaE,1415
-c2cgeoportal_geoportal-2.8.1.137.dist-info/top_level.txt,sha256=PJIbY7Nx51dDrJ052f5mDA7c6Tehm5aD-Gb32L_CtJA,29
-c2cgeoportal_geoportal-2.8.1.137.dist-info/RECORD,,
+c2cgeoportal_geoportal-2.8.1.139.dist-info/METADATA,sha256=Zqp_yPZ_BgDhImyZC0B3T61eKhQPU9cNtMKu3zT_SGs,2172
+c2cgeoportal_geoportal-2.8.1.139.dist-info/WHEEL,sha256=a-zpFRIJzOq5QfuhBzbhiA1eHTzNCJn8OdRvhdNX0Rk,110
+c2cgeoportal_geoportal-2.8.1.139.dist-info/entry_points.txt,sha256=w0xGr1Bo8q5GBFiP4JgqbSIg-bNhG7bsGoEaGSTfzaE,1415
+c2cgeoportal_geoportal-2.8.1.139.dist-info/top_level.txt,sha256=PJIbY7Nx51dDrJ052f5mDA7c6Tehm5aD-Gb32L_CtJA,29
+c2cgeoportal_geoportal-2.8.1.139.dist-info/RECORD,,