c2cgeoportal-geoportal 2.8.1.229__py2.py3-none-any.whl → 2.8.1.230__py2.py3-none-any.whl

c2cgeoportal_geoportal/views/fulltextsearch.py

@@ -1,4 +1,4 @@
-# Copyright (c) 2011-2023, Camptocamp SA
+# Copyright (c) 2011-2025, Camptocamp SA
 # All rights reserved.
 
 # Redistribution and use in source and binary forms, with or without
@@ -39,6 +39,7 @@ from sqlalchemy import and_, desc, func, or_
 from c2cgeoportal_commons.models import DBSession
 from c2cgeoportal_commons.models.main import FullTextSearch, Interface
 from c2cgeoportal_geoportal import locale_negotiator
+from c2cgeoportal_geoportal.lib import get_roles_id
 from c2cgeoportal_geoportal.lib.caching import get_region
 from c2cgeoportal_geoportal.lib.common_headers import Cache, set_common_headers
 from c2cgeoportal_geoportal.lib.fulltextsearch import Normalize
@@ -97,14 +98,20 @@ class FullTextSearchView:
         _filter = FullTextSearch.ts.op("@@")(func.to_tsquery(language, terms_ts))
 
         if self.request.user is None:
-            _filter = and_(_filter, FullTextSearch.public.is_(True))
+            _filter = and_(
+                _filter,
+                or_(
+                    FullTextSearch.public.is_(True),
+                    FullTextSearch.role_id.in_(get_roles_id(self.request)),
+                ),
+            )
         else:
             _filter = and_(
                 _filter,
                 or_(
                     FullTextSearch.public.is_(True),
                     FullTextSearch.role_id.is_(None),
-                    FullTextSearch.role_id.in_([r.id for r in self.request.user.roles]),
+                    FullTextSearch.role_id.in_(get_roles_id(self.request)),
                 ),
             )
 

{c2cgeoportal_geoportal-2.8.1.229.dist-info → c2cgeoportal_geoportal-2.8.1.230.dist-info}/METADATA

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

{c2cgeoportal_geoportal-2.8.1.229.dist-info → c2cgeoportal_geoportal-2.8.1.230.dist-info}/RECORD

@@ -155,7 +155,7 @@ c2cgeoportal_geoportal/views/__init__.py,sha256=dRkrULopklvgOGEH481Sv381VcwBt9dg
 c2cgeoportal_geoportal/views/dev.py,sha256=e1oZkKwwQvssMOzg3Zao3Jm4WNIFVwEI3EOR1Xj3-_Y,2533
 c2cgeoportal_geoportal/views/dynamic.py,sha256=dwT2yIBnZYxt7jq3jg5oodU_1MZtjJea0K608lGefhU,8613
 c2cgeoportal_geoportal/views/entry.py,sha256=eeJ2xpohmG6F9Ujw5L81oD4q8Lu3rWtja3ScO0Mvsfs,5780
-c2cgeoportal_geoportal/views/fulltextsearch.py,sha256=0-KA3Pyx52cZWx46uw84jfBM9EOjUx4bMMZkBgEsKFI,8330
+c2cgeoportal_geoportal/views/fulltextsearch.py,sha256=6njAuNgLgLeZdgOlnlh_Eqp3P6Dt3TLCg_S-8-wV1nM,8536
 c2cgeoportal_geoportal/views/geometry_processing.py,sha256=LpzAR6RgGS9XfsGLmNqD3dq7ghhZ5Q_eSZgiD8f3XZU,2946
 c2cgeoportal_geoportal/views/i18n.py,sha256=7Avpt-aVEVlS3SrwtZkvuJ8_0gBZvVrCviyaIZBx7jY,5292
 c2cgeoportal_geoportal/views/layers.py,sha256=obRfvJE_IhqT0oQdyjv1Lce_KZVb8GWDrkpMZNYqZH0,28773
@@ -186,8 +186,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.229.dist-info/METADATA,sha256=PaEq-a40vtZFlU0Vsllv_K89ElHyrSGg8AiiII_AGtw,2172
-c2cgeoportal_geoportal-2.8.1.229.dist-info/WHEEL,sha256=a-zpFRIJzOq5QfuhBzbhiA1eHTzNCJn8OdRvhdNX0Rk,110
-c2cgeoportal_geoportal-2.8.1.229.dist-info/entry_points.txt,sha256=w0xGr1Bo8q5GBFiP4JgqbSIg-bNhG7bsGoEaGSTfzaE,1415
-c2cgeoportal_geoportal-2.8.1.229.dist-info/top_level.txt,sha256=PJIbY7Nx51dDrJ052f5mDA7c6Tehm5aD-Gb32L_CtJA,29
-c2cgeoportal_geoportal-2.8.1.229.dist-info/RECORD,,
+c2cgeoportal_geoportal-2.8.1.230.dist-info/METADATA,sha256=uxFGkPjKx0oXiv5xMhOKm0qP_raqSR1PoU_CIOEqRys,2172
+c2cgeoportal_geoportal-2.8.1.230.dist-info/WHEEL,sha256=a-zpFRIJzOq5QfuhBzbhiA1eHTzNCJn8OdRvhdNX0Rk,110
+c2cgeoportal_geoportal-2.8.1.230.dist-info/entry_points.txt,sha256=w0xGr1Bo8q5GBFiP4JgqbSIg-bNhG7bsGoEaGSTfzaE,1415
+c2cgeoportal_geoportal-2.8.1.230.dist-info/top_level.txt,sha256=PJIbY7Nx51dDrJ052f5mDA7c6Tehm5aD-Gb32L_CtJA,29
+c2cgeoportal_geoportal-2.8.1.230.dist-info/RECORD,,