Integration of ISR fixes:

[tools/siman.git] / Workspace / Siman / WebContent / jsp / menubar.jsp

diff --git a/Workspace/Siman/WebContent/jsp/menubar.jsp b/Workspace/Siman/WebContent/jsp/menubar.jsp
index dce6d5193b7d2404da7f1277d4e652e4bc8a809d..90b11cbcd7f2de0c7571861c08d114a5d060c96a 100644 (file)
--- a/Workspace/Siman/WebContent/jsp/menubar.jsp
+++ b/Workspace/Siman/WebContent/jsp/menubar.jsp
@@ -113,12 +113,7 @@
                        <td><br />
                        <img src="<s:url value="/skin/image.user.png"/>" border="none" /></td>
                        <s:if test="connectedUser != null">
-                               <s:if test="connectedUser.roleNames == 'sysadmin'">
-                                       <td><s:text name="label.sysadmin" /></td>
-                               </s:if>
-                               <s:else>
-                                       <td><s:property value="connectedUser.displayName" /></td>
-                               </s:else>
+                           <td><s:property value="getText(connectedUser.displayName)" /></td>
                                <td>|&nbsp;&nbsp;<s:a href="%{logout}" cssClass="link">
                                        <s:text name="menu.logout" />
                                </s:a></td>