shuber 2005/03/24 16:05:50 CET
Modified files:
src/view/jsp mysettings.jsp
Log:
JAHIA-277 : LDAP user properties in read-only grey mode
- Modified implementation of user properties to introduce read-only
properties.
- This requires modifications in template to the mysettings.jsp file.
Revision Changes Path
1.3 +25 -9 corporate_portal_templates/src/view/jsp/mysettings.jsp
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/corporate_portal_templates/src/view/jsp/mysettings.jsp.diff?r1=1.2&r2=1.3&f=h
Index: mysettings.jsp
===================================================================
RCS file:
/home/cvs/repository/corporate_portal_templates/src/view/jsp/mysettings.jsp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- mysettings.jsp 9 Nov 2004 19:21:23 -0000 1.2
+++ mysettings.jsp 24 Mar 2005 15:05:49 -0000 1.3
@@ -1,7 +1,12 @@
<%@ include file="include/header.inc"%>
-
-<%@ page import="org.jahia.engines.mysettings.MySettingsEngine"%>
-
+<%@ page import="java.util.*,javax.servlet.http.*" %>
+<%@ page
import="org.jahia.engines.mysettings.MySettingsEngine,org.jahia.services.usermanager.*"%>
+<%@ taglib uri="JahiaLib" prefix="jahia" %>
+<%@ taglib uri="jahiaHtmlLib" prefix="jahiaHtml" %>
+<%@ taglib uri="contentLib" prefix="content" %>
+<%@ taglib uri="/WEB-INF/etc/struts/struts-bean" prefix="bean" %>
+<%@ taglib uri="/WEB-INF/etc/struts/struts-html" prefix="html" %>
+<%@ taglib uri="/WEB-INF/etc/struts/struts-logic" prefix="logic" %>
<style type="text/css">
<!--
DIV#errors { color : #B42C29; }
@@ -16,11 +21,20 @@
%>
<%!
public String getUserProp(Map engineMap, String propName) {
- String propValue = (String)
engineMap.get(MySettingsEngine.USER_PROPERTY_PREFIX + propName);
+ UserProperty propValue = (UserProperty)
engineMap.get(MySettingsEngine.USER_PROPERTY_PREFIX + propName);
if (propValue == null) {
return "";
} else {
- return propValue;
+ return propValue.getValue();
+ }
+ }
+
+ public boolean isPropReadOnly(Map engineMap, String propName) {
+ UserProperty propValue = (UserProperty)
engineMap.get(MySettingsEngine.USER_PROPERTY_PREFIX + propName);
+ if (propValue == null) {
+ return false;
+ } else {
+ return propValue.isReadOnly();
}
}
%>
@@ -48,6 +62,7 @@
<form name="mainForm" method="POST" action="?mode=display&screen=save">
+ <% if (!jData.params().getUser().isPasswordReadOnly()) { %>
<table>
<tr>
<td><jahia:resourceBundle
resourceBundle="jahiatemplates.Corporate_portal_templates"
resourceName="mySettingsPassword1"/> :</td>
@@ -58,24 +73,25 @@
<td><input type="password"
name="<%=MySettingsEngine.REQUEST_PASSWORD_CONFIRMATION_KEY%>" value=""></td>
</tr>
</table>
+ <% } %>
<h2><jahia:resourceBundle
resourceBundle="jahiatemplates.Corporate_portal_templates"
resourceName="mySettingsProperties"/></h2>
<table>
<tr>
<td><jahia:resourceBundle
resourceBundle="jahiatemplates.Corporate_portal_templates"
resourceName="mySettingsFirstName"/> :</td>
- <td><input type="text"
name='<%=MySettingsEngine.USER_PROPERTY_PREFIX+"firstname"%>'
value='<%=getUserProp(engineMap, "firstname")%>' /></td>
+ <td><input type="text" <% if (isPropReadOnly(engineMap, "firstname")) {
%>disabled="true"<%}%>
name='<%=MySettingsEngine.USER_PROPERTY_PREFIX+"firstname"%>'
value='<%=getUserProp(engineMap, "firstname")%>' /></td>
</tr>
<tr>
<td><jahia:resourceBundle
resourceBundle="jahiatemplates.Corporate_portal_templates"
resourceName="mySettingsLastName"/> :</td>
- <td><input type="text"
name='<%=MySettingsEngine.USER_PROPERTY_PREFIX+"lastname"%>'
value='<%=getUserProp(engineMap, "lastname")%>' /></td>
+ <td><input type="text" <% if (isPropReadOnly(engineMap, "lastname")) {
%>disabled="true"<%}%>
name='<%=MySettingsEngine.USER_PROPERTY_PREFIX+"lastname"%>'
value='<%=getUserProp(engineMap, "lastname")%>' /></td>
</tr>
<tr>
<td><jahia:resourceBundle
resourceBundle="jahiatemplates.Corporate_portal_templates"
resourceName="mySettingsOrganization"/> :</td>
- <td><input type="text"
name='<%=MySettingsEngine.USER_PROPERTY_PREFIX+"organization"%>'
value='<%=getUserProp(engineMap, "organization")%>' /></td>
+ <td><input type="text" <% if (isPropReadOnly(engineMap, "organization")) {
%>disabled="true"<%}%>
name='<%=MySettingsEngine.USER_PROPERTY_PREFIX+"organization"%>'
value='<%=getUserProp(engineMap, "organization")%>' /></td>
</tr>
<tr>
<td><jahia:resourceBundle
resourceBundle="jahiatemplates.Corporate_portal_templates"
resourceName="mySettingsEmail"/> :</td>
- <td><input type="text"
name='<%=MySettingsEngine.USER_PROPERTY_PREFIX+"email"%>'
value='<%=getUserProp(engineMap, "email")%>' /></td>
+ <td><input type="text" <% if (isPropReadOnly(engineMap, "email")) {
%>disabled="true"<%}%>
name='<%=MySettingsEngine.USER_PROPERTY_PREFIX+"email"%>'
value='<%=getUserProp(engineMap, "email")%>' /></td>
</tr>
</table>
