c2cgeoportal-geoportal 2.9rc113__py3-none-any.whl → 2.9rc115__py3-none-any.whl

c2cgeoportal_geoportal/scripts/theme2fts.py

@@ -1,4 +1,4 @@
-# Copyright (c) 2014-2023, Camptocamp SA
+# Copyright (c) 2014-2025, Camptocamp SA
 # All rights reserved.
 
 # Redistribution and use in source and binary forms, with or without
@@ -268,8 +268,13 @@ class Import:
 
     @staticmethod
     def _layer_visible(
-        layer: "c2cgeoportal_commons.models.main.Layer", role: "c2cgeoportal_commons.models.main.Role"
+        layer: "c2cgeoportal_commons.models.main.Layer",
+        role: Optional["c2cgeoportal_commons.models.main.Role"],
     ) -> bool:
+        if layer.public:
+            return True
+        if role is None:
+            return False
         for restrictionarea in layer.restrictionareas:
             if role in restrictionarea.roles:
                 return True
@@ -281,10 +286,7 @@ class Import:
         interface: "c2cgeoportal_commons.models.main.Interface",
         role: Optional["c2cgeoportal_commons.models.main.Role"],
     ) -> bool:
-        if role is None:
-            fill = layer.public and interface in layer.interfaces
-        else:
-            fill = interface in layer.interfaces and not layer.public and self._layer_visible(layer, role)
+        fill = interface in layer.interfaces and self._layer_visible(layer, role)
 
         if fill and self.options.layers:
             self._add_fts(layer, interface, "add_layer", role)

{c2cgeoportal_geoportal-2.9rc113.dist-info → c2cgeoportal_geoportal-2.9rc115.dist-info}/METADATA

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

{c2cgeoportal_geoportal-2.9rc113.dist-info → c2cgeoportal_geoportal-2.9rc115.dist-info}/RECORD

@@ -147,7 +147,7 @@ c2cgeoportal_geoportal/scripts/c2cupgrade.py,sha256=oWgl5ngJaUVXDKJqJ33aZB8ET_Xc
 c2cgeoportal_geoportal/scripts/create_demo_theme.py,sha256=-SL-fvAPjgiJZEKYcbhXsZm713txhtWQB18X231k6xQ,3263
 c2cgeoportal_geoportal/scripts/manage_users.py,sha256=Ih3X_V_xUw59Ums4a1x6qQQtz9VtE7PaxAj-tiZIOPg,5586
 c2cgeoportal_geoportal/scripts/pcreate.py,sha256=xU87K_JYwFE6U4zEGjHvqNj2iiSuAhPkfWMpI576mZ8,11245
-c2cgeoportal_geoportal/scripts/theme2fts.py,sha256=Tx1jUfDUwNtwZ5TCyfpldZIbIkzZiQ3dq-kv_YQ9yFE,13737
+c2cgeoportal_geoportal/scripts/theme2fts.py,sha256=tGnwIg3IWEdxXr5OFJeIyErExa-9PS2kPSzPpz_JlXk,13725
 c2cgeoportal_geoportal/scripts/urllogin.py,sha256=qGOOvx2ZN3qnENGzo8NScRqfFC06l1yc48vU6Qx3MBo,3319
 c2cgeoportal_geoportal/templates/login.html,sha256=Jy8CUw2KrSviePknsvWJLDqCUXam-vPhnMUv7UcD4Pc,2475
 c2cgeoportal_geoportal/templates/notlogin.html,sha256=XLCwJ8q7hqk6GIaxwhyMOaMZZZvsD_MMZaCERO8n2AY,1528
@@ -187,8 +187,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.9rc113.dist-info/METADATA,sha256=tcNFdEgSsJAILEmbiKvB37WLs5iwKTJDrlGisZCRM_s,1887
-c2cgeoportal_geoportal-2.9rc113.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
-c2cgeoportal_geoportal-2.9rc113.dist-info/entry_points.txt,sha256=3dnX260FsLX_AubeNMdyeta_z1X4CxcD3steAlfPx2I,1414
-c2cgeoportal_geoportal-2.9rc113.dist-info/top_level.txt,sha256=PJIbY7Nx51dDrJ052f5mDA7c6Tehm5aD-Gb32L_CtJA,29
-c2cgeoportal_geoportal-2.9rc113.dist-info/RECORD,,
+c2cgeoportal_geoportal-2.9rc115.dist-info/METADATA,sha256=Aoqwite_ukN3pyeli6vpRH0dvlbORuZ6qOuyqIWl3ic,1887
+c2cgeoportal_geoportal-2.9rc115.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
+c2cgeoportal_geoportal-2.9rc115.dist-info/entry_points.txt,sha256=3dnX260FsLX_AubeNMdyeta_z1X4CxcD3steAlfPx2I,1414
+c2cgeoportal_geoportal-2.9rc115.dist-info/top_level.txt,sha256=PJIbY7Nx51dDrJ052f5mDA7c6Tehm5aD-Gb32L_CtJA,29
+c2cgeoportal_geoportal-2.9rc115.dist-info/RECORD,,