c2cgeoportal-geoportal 2.9.0.202__py3-none-any.whl → 2.9.0.204__py3-none-any.whl

c2cgeoportal_geoportal/views/fulltextsearch.py

@@ -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
@@ -38,6 +38,7 @@ from sqlalchemy import ColumnElement, 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
@@ -98,16 +99,21 @@ class FullTextSearchView:
         ]
         terms_ts = "&".join(w + ":*" for w in terms_array if w != "")
         _filter: ColumnElement[bool] = 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.9.0.202.dist-info → c2cgeoportal_geoportal-2.9.0.204.dist-info}/METADATA

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

{c2cgeoportal_geoportal-2.9.0.202.dist-info → c2cgeoportal_geoportal-2.9.0.204.dist-info}/RECORD

@@ -156,7 +156,7 @@ c2cgeoportal_geoportal/views/__init__.py,sha256=KNfldZFuKFfNjGJsE2HyW3gUfWUY5IKS
 c2cgeoportal_geoportal/views/dev.py,sha256=4_xprN8ccbiEInXcpIWRGI55nU7LZI98JN7rNy4sQVg,2539
 c2cgeoportal_geoportal/views/dynamic.py,sha256=w92NRkIn0Ahahn0LG9F-KpMOx0lhffZxK4ecn6k8i40,8907
 c2cgeoportal_geoportal/views/entry.py,sha256=wlDCRGNpFlECGgwLktBEQckFAz0XBWuVwS8vHSGfBLA,6931
-c2cgeoportal_geoportal/views/fulltextsearch.py,sha256=uiidVzz-mQ-_eF1GL3ZCWd67-p-PNnqE7QZkBxsro4Q,8397
+c2cgeoportal_geoportal/views/fulltextsearch.py,sha256=i6d0-1N2pNG6KWq9Bih_kD4TQAZ54zMbuOFZTN-fqaU,8602
 c2cgeoportal_geoportal/views/geometry_processing.py,sha256=5dkJ20Lk12zqfzvmfws2YFxutSX2vxzdetQ4CmYxSi8,2958
 c2cgeoportal_geoportal/views/i18n.py,sha256=EEyM5Y7DSuQffiwpFrkFclUcneRCiir4bakXY6lGZjI,5343
 c2cgeoportal_geoportal/views/layers.py,sha256=I1_9N8Zui4b2t9qfX1Z4QGX7-vOPeUKKvyJWLH8g9Fo,29226
@@ -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.9.0.202.dist-info/METADATA,sha256=BPjtxiAPi9MYsdJdzIAyZKDia6lChv9EdbgMoNrsSWk,1923
-c2cgeoportal_geoportal-2.9.0.202.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
-c2cgeoportal_geoportal-2.9.0.202.dist-info/entry_points.txt,sha256=3dnX260FsLX_AubeNMdyeta_z1X4CxcD3steAlfPx2I,1414
-c2cgeoportal_geoportal-2.9.0.202.dist-info/top_level.txt,sha256=PJIbY7Nx51dDrJ052f5mDA7c6Tehm5aD-Gb32L_CtJA,29
-c2cgeoportal_geoportal-2.9.0.202.dist-info/RECORD,,
+c2cgeoportal_geoportal-2.9.0.204.dist-info/METADATA,sha256=sQeWroAUFcENGRZbL50nNim689XGfPoCLdnDjVTAtas,1923
+c2cgeoportal_geoportal-2.9.0.204.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
+c2cgeoportal_geoportal-2.9.0.204.dist-info/entry_points.txt,sha256=3dnX260FsLX_AubeNMdyeta_z1X4CxcD3steAlfPx2I,1414
+c2cgeoportal_geoportal-2.9.0.204.dist-info/top_level.txt,sha256=PJIbY7Nx51dDrJ052f5mDA7c6Tehm5aD-Gb32L_CtJA,29
+c2cgeoportal_geoportal-2.9.0.204.dist-info/RECORD,,