From sletellier@users.chorem.org Wed May 25 18:58:41 2011 From: sletellier@users.chorem.org To: vradi-commits@list.chorem.org Subject: [Vradi-commits] r51 - in trunk/vradi-web/src/main: resources/i18n webapp/WEB-INF/jsp Date: Wed, 25 May 2011 18:58:41 +0200 Message-ID: <20110525165841.2154415976@nuiton.codelutin.com> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============2463286436845785521==" --===============2463286436845785521== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Author: sletellier Date: 2011-05-25 18:58:41 +0200 (Wed, 25 May 2011) New Revision: 51 Url: http://chorem.org/repositories/revision/vradi/51 Log: - Don't use ognl - Add link to edit forms notes =20 Modified: trunk/vradi-web/src/main/resources/i18n/vradi-web_en_GB.properties trunk/vradi-web/src/main/resources/i18n/vradi-web_fr_FR.properties trunk/vradi-web/src/main/webapp/WEB-INF/jsp/search.jsp Modified: trunk/vradi-web/src/main/resources/i18n/vradi-web_en_GB.properties =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/vradi-web/src/main/resources/i18n/vradi-web_en_GB.properties 2011-0= 5-25 13:54:55 UTC (rev 50) +++ trunk/vradi-web/src/main/resources/i18n/vradi-web_en_GB.properties 2011-0= 5-25 16:58:41 UTC (rev 51) @@ -26,3 +26,4 @@ vradi.search.title=3DSearch vradi.form.object=3DObject vradi.form.creationDate=3DCreation date +vradi.search.formNoteEdit=3DNotes edition \ No newline at end of file Modified: trunk/vradi-web/src/main/resources/i18n/vradi-web_fr_FR.properties =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/vradi-web/src/main/resources/i18n/vradi-web_fr_FR.properties 2011-0= 5-25 13:54:55 UTC (rev 50) +++ trunk/vradi-web/src/main/resources/i18n/vradi-web_fr_FR.properties 2011-0= 5-25 16:58:41 UTC (rev 51) @@ -25,5 +25,6 @@ vradi.register.pwdDontMatch=3DLes mots de passe sont diff=C3=A9rents vradi.register.submit=3DS'enregistrer vradi.register.title=3DS'enregistrer +vradi.search.formNoteEdit=3DEdition des notes vradi.search.submit=3DRechercher vradi.search.title=3DRecherche Modified: trunk/vradi-web/src/main/webapp/WEB-INF/jsp/search.jsp =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/vradi-web/src/main/webapp/WEB-INF/jsp/search.jsp 2011-05-25 13:54:5= 5 UTC (rev 50) +++ trunk/vradi-web/src/main/webapp/WEB-INF/jsp/search.jsp 2011-05-25 16:58:4= 1 UTC (rev 51) @@ -1,11 +1,12 @@ <%@page import=3D"org.chorem.vradi.entities.Infogene"%> +<%@page import=3D"org.chorem.vradi.decorators.EscapeScriptColomnDecorator" %> +<%@page import=3D"org.chorem.vradi.entities.Form" %> +<%@page import=3D"org.chorem.vradi.decorators.DateFormatColumnDecorator" %> <%@page contentType=3D"text/html;charset=3DUTF-8" pageEncoding=3D"UTF-8"%> <%@taglib prefix=3D"s" uri=3D"/struts-tags"%> <%@taglib prefix=3D"displaytag" uri=3D"http://displaytag.sf.net"%> - =20 - + @@ -26,13 +27,18 @@ property=3D"<%=3DInfogene.FIELD_INFOGENE_CREA= TIONDATE%>" sortable=3D"true" sortProperty=3D"<%=3DInfogene.FQ_FIELD_INFOGE= NE_CREATIONDATE%>" - decorator=3D"org.chorem.vradi.decorators.Date= FormatColumnDecorator"/> + decorator=3D"<%=3DDateFormatColumnDecorator.c= lass.getName()%>"/> =20 " sortable=3D"true" sortProperty=3D"<%=3DInfogene.FQ_FIELD_INFOGE= NE_OBJET%>" - decorator=3D"org.chorem.vradi.decorators.Esca= peScriptColomnDecorator"/> + decorator=3D"<%=3DEscapeScriptColomnDecorator= .class.getName()%>"/> + + + <%=3D"formNoteList/" + ((For= m)f).getWikittyId()%> + + \ No newline at end of file --===============2463286436845785521==--