Use correct attribute to get the role from a user object

Geoportail-Luxembourg · May 19, 2021 · b824521 · b824521
1 parent 182635c
commit b824521
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/geoportal/geoportailv3_geoportal/views/fulltextsearch.py b/geoportal/geoportailv3_geoportal/views/fulltextsearch.py
@@ -138,7 +138,7 @@ def fulltextsearch(self):
         if self.request.user is None:
             filters['must'].append({"term": {"public": True}})
         else:
-            role_id = self.request.user.role.id
+            role_id = self.request.user.settings_role.id
             filters['should'].append({"term": {"public": True}})
             filters['should'].append({"term": {"role_id": role_id}})
 
@@ -234,7 +234,7 @@ def layersearch(self):
         if self.request.user is None:
             filters['must'].append({"term": {"public": True}})
         else:
-            role_id = self.request.user.role.id
+            role_id = self.request.user.settings_role.id
             filters['should'].append({"term": {"public": True}})
             filters['should'].append({"term": {"role_id": role_id}})
 

diff --git a/geoportal/geoportailv3_geoportal/views/luxprintproxy.py b/geoportal/geoportailv3_geoportal/views/luxprintproxy.py
@@ -269,7 +269,7 @@ def _is_authorized(self, internal_wms):
         else:
             restriction = DBSession.query(RestrictionArea).filter(
                 RestrictionArea.roles.any(
-                    Role.id == self.request.user.role.id)).filter(
+                    Role.id == self.request.user.settings_role.id)).filter(
                         RestrictionArea.layers.any(
                             Layer.id == internal_wms.id
                         )

diff --git a/geoportal/geoportailv3_geoportal/views/wms.py b/geoportal/geoportailv3_geoportal/views/wms.py
@@ -172,7 +172,7 @@ def internal_proxy_wms(self):
             # Check if the layer has a restriction area
             restriction: Optional[RestrictionArea] = DBSession.query(RestrictionArea).filter(
                 RestrictionArea.roles.any(
-                    Role.id == self.request.user.role.id)).filter(
+                    Role.id == self.request.user.settings_role.id)).filter(
                 RestrictionArea.layers.any(
                     Layer.id == internal_wms.id
                 )