Commit c8836d9b authored by Greg Thomas's avatar Greg Thomas Committed by Guus der Kinderen

Fix NPE on User Properties screen

parent c31c4ac2
...@@ -301,8 +301,9 @@ ...@@ -301,8 +301,9 @@
</table> </table>
</div> </div>
<br> <% if (user != null) { %>
<div class="jive-table"> <br>
<div class="jive-table">
<table cellpadding="0" cellspacing="0" border="0" width="100%"> <table cellpadding="0" cellspacing="0" border="0" width="100%">
<thead> <thead>
<tr> <tr>
...@@ -318,17 +319,19 @@ ...@@ -318,17 +319,19 @@
<% } %> <% } %>
</tbody> </tbody>
</table> </table>
</div> </div>
<br><br>
<% if (user != null && !UserManager.getUserProvider().isReadOnly()) { %> <% if (!UserManager.getUserProvider().isReadOnly()) { %>
<form action="user-edit-form.jsp"> <br><br>
<input type="hidden" name="username" value="<%= StringUtils.escapeForXML(user.getUsername()) %>">
<input type="submit" value="<fmt:message key="global.edit_properties" />">
</form>
<form action="user-edit-form.jsp">
<input type="hidden" name="username" value="<%= StringUtils.escapeForXML(user.getUsername()) %>">
<input type="submit" value="<fmt:message key="global.edit_properties" />">
</form>
<% } %>
<% } %> <% } %>
</body> </body>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment