From ff8a261d5a8f0a942b54779662703393307ae724 Mon Sep 17 00:00:00 2001
From: kamiljarmusik <kamil.jarmusik@gmail.com>
Date: Wed, 23 Aug 2023 21:10:13 +0200
Subject: [PATCH 1/2] #2666 Fixed visible 'Access User' and 'Views' in 'Point
 Details'

---
 WebContent/WEB-INF/jsp/dataPointDetails.jsp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/WebContent/WEB-INF/jsp/dataPointDetails.jsp b/WebContent/WEB-INF/jsp/dataPointDetails.jsp
index aa4900086a..3c87f8c2c5 100644
--- a/WebContent/WEB-INF/jsp/dataPointDetails.jsp
+++ b/WebContent/WEB-INF/jsp/dataPointDetails.jsp
@@ -415,7 +415,7 @@
 
     <c:set var="isRoles" value="${!empty sessionUser && sessionUser.getAttribute('roles') != null}" />
     <c:set var="isRolePublic" value="${isRoles && sessionUser.getAttribute('roles').contains('ROLE_PUBLIC')}" />
-    <c:if test="!isRolePublic">
+    <c:if test="${!isRolePublic}">
     <tr>
       <td valign="top">
         <div class="borderDiv marR">

From a981a21e4660a5197b89f3dd9a5da86c78d1cdd2 Mon Sep 17 00:00:00 2001
From: kamiljarmusik <kamil.jarmusik@gmail.com>
Date: Thu, 24 Aug 2023 12:15:38 +0200
Subject: [PATCH 2/2] #2666 Fixed visible 'Access User' and 'Views' in 'Point
 Details' - refactor

---
 WebContent/WEB-INF/jsp/dataPointDetails.jsp | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/WebContent/WEB-INF/jsp/dataPointDetails.jsp b/WebContent/WEB-INF/jsp/dataPointDetails.jsp
index 3c87f8c2c5..343e09b54d 100644
--- a/WebContent/WEB-INF/jsp/dataPointDetails.jsp
+++ b/WebContent/WEB-INF/jsp/dataPointDetails.jsp
@@ -414,8 +414,9 @@
     </tr>
 
     <c:set var="isRoles" value="${!empty sessionUser && sessionUser.getAttribute('roles') != null}" />
-    <c:set var="isRolePublic" value="${isRoles && sessionUser.getAttribute('roles').contains('ROLE_PUBLIC')}" />
-    <c:if test="${!isRolePublic}">
+    <c:set var="isRoleAdmin" value="${isRoles && sessionUser.getAttribute('roles').contains('ROLE_ADMIN')}" />
+    <c:set var="isRoleUser" value="${isRoles && sessionUser.getAttribute('roles').contains('ROLE_USER')}" />
+    <c:if test="${isRoleAdmin || isRoleUser}">
     <tr>
       <td valign="top">
         <div class="borderDiv marR">
@@ -438,7 +439,8 @@
           </table>
         </div>
       </td>
-        
+      </c:if>
+      <c:if test="${isRoleAdmin}">
       <td colspan="2" valign="top">
         <div class="borderDiv">
           <span class="smallTitle" style="margin:3px;"><fmt:message key="pointDetails.userAccess"/></span>