Author: tchemit Date: 2013-12-02 14:10:39 +0100 (Mon, 02 Dec 2013) New Revision: 3857 Url: http://chorem.org/projects/pollen/repository/revisions/3857 Log: fixes #961: Can't modify an account Modified: branches/pollen-1.5.x/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/admin/usersList.jsp branches/pollen-1.5.x/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/user/edit.jsp Modified: branches/pollen-1.5.x/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/admin/usersList.jsp =================================================================== --- branches/pollen-1.5.x/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/admin/usersList.jsp 2013-10-25 15:13:13 UTC (rev 3856) +++ branches/pollen-1.5.x/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/admin/usersList.jsp 2013-12-02 13:10:39 UTC (rev 3857) @@ -123,6 +123,7 @@ label="%{getText('pollen.common.lastName')}" size="40"/> <s:checkbox key="editUser.administrator" label="%{getText('pollen.common.administrator')}"/> + <s:hidden key="editUser.email" label=""/> </fieldset> <br/> <s:submit action="edit" key="pollen.action.validate" align="center"/> Modified: branches/pollen-1.5.x/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/user/edit.jsp =================================================================== --- branches/pollen-1.5.x/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/user/edit.jsp 2013-10-25 15:13:13 UTC (rev 3856) +++ branches/pollen-1.5.x/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/user/edit.jsp 2013-12-02 13:10:39 UTC (rev 3857) @@ -52,6 +52,9 @@ key="pollen.common.firstName"/> <s:textfield name="pollenUserAccount.lastName" key="pollen.common.lastName"/> + <s:if test="exists"> + <s:hidden key="pollenUserAccount.email" label=""/> + </s:if> </fieldset> <br/> <s:submit action="edit" key="pollen.action.validate" align="center"/>