Author: bpoussin Date: 2011-05-30 13:13:08 +0200 (Mon, 30 May 2011) New Revision: 75 Url: http://chorem.org/repositories/revision/vradi/75 Log: en rendu HTML de l'info il ne faut pas de <pre> Modified: trunk/vradi-web/src/main/java/org/chorem/vradi/actions/RestoreUserAction.java trunk/vradi-web/src/main/webapp/WEB-INF/jsp/userInfo.jsp Modified: trunk/vradi-web/src/main/java/org/chorem/vradi/actions/RestoreUserAction.java =================================================================== --- trunk/vradi-web/src/main/java/org/chorem/vradi/actions/RestoreUserAction.java 2011-05-30 11:10:37 UTC (rev 74) +++ trunk/vradi-web/src/main/java/org/chorem/vradi/actions/RestoreUserAction.java 2011-05-30 11:13:08 UTC (rev 75) @@ -62,13 +62,13 @@ } if (user.getInfo() == null) { - infoHtml = _("vradi.user.noinfo"); + infoHtml = "<pre>" + _("vradi.user.noinfo") + "</pre>"; } else { try { infoHtml = JRST.generate(JRST.TYPE_HTML_INNER_BODY, user.getInfo()); } catch(Exception eee) { log.info("Can't generate HTML from RST", eee); - infoHtml = user.getInfo(); + infoHtml = "<pre>" + user.getInfo() + "</pre>"; } } } Modified: trunk/vradi-web/src/main/webapp/WEB-INF/jsp/userInfo.jsp =================================================================== --- trunk/vradi-web/src/main/webapp/WEB-INF/jsp/userInfo.jsp 2011-05-30 11:10:37 UTC (rev 74) +++ trunk/vradi-web/src/main/webapp/WEB-INF/jsp/userInfo.jsp 2011-05-30 11:13:08 UTC (rev 75) @@ -24,6 +24,5 @@ % ce qui pourrait etre dangereux si on a un utilisateur mal vayant %--%> <s:property value="localUserEmail" default="no email" escape="true"/> -<pre> - <s:property value="localUserInfo" default="no information" escape="true"/> -</pre> \ No newline at end of file + +<s:property value="localUserInfo" default="no information" escape="true"/></pre> \ No newline at end of file