Merge pull request #2667 from SCADA-LTS/fix/#2666_Fixed_visible_Acces…

…s_User_and_Views_in_Point_Details #2666 Fixed visible 'Access User' and 'Views' in 'Point Details'
SCADA-LTS · Aug 24, 2023 · 676b2ad · 676b2ad
2 parents e591327 + a981a21
commit 676b2ad
Showing 1 changed file with 5 additions and 3 deletions.
diff --git 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>