From sletellier@users.chorem.org Wed Jun 22 11:37:50 2011
From: sletellier@users.chorem.org
To: vradi-commits@list.chorem.org
Subject: [Vradi-commits] r90 - in trunk/vradi-web/src/main: resources/i18n
	webapp/WEB-INF/jsp
Date: Wed, 22 Jun 2011 11:37:50 +0200
Message-ID: <20110622093750.BAAA21585F@nuiton.codelutin.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============3620955273267439316=="

--===============3620955273267439316==
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: quoted-printable

Author: sletellier
Date: 2011-06-22 11:37:50 +0200 (Wed, 22 Jun 2011)
New Revision: 90

Url: http://chorem.org/repositories/revision/vradi/90

Log:
Add link in table to edit form



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/resultGrid.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=
6-21 15:22:51 UTC (rev 89)
+++ trunk/vradi-web/src/main/resources/i18n/vradi-web_en_GB.properties	2011-0=
6-22 09:37:50 UTC (rev 90)
@@ -38,4 +38,6 @@
 vradi.search.queryName=3DRequest name
 vradi.search.saveQuery=3DSave request
 vradi.formView.title=3DForm view
-vradi.search.thesaurusFilterButton=3DFilter
\ No newline at end of file
+vradi.search.thesaurusFilterButton=3DFilter
+vradi.form.editAction=3DEdit
+vradi.form.action=3DAction
\ 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=
6-21 15:22:51 UTC (rev 89)
+++ trunk/vradi-web/src/main/resources/i18n/vradi-web_fr_FR.properties	2011-0=
6-22 09:37:50 UTC (rev 90)
@@ -14,7 +14,9 @@
 vradi.forgotPassword.emailDoesntExist=3DCette adresse email n'existe pas
 vradi.forgotpwd.submit=3DEnvoyer
 vradi.forgotpwd.title=3DVous avez oubli=C3=A9 votre mot de passe ?
+vradi.form.action=3DAction
 vradi.form.creationDate=3DDate de cr=C3=A9ation
+vradi.form.editAction=3DEditer
 vradi.form.object=3DObjet
 vradi.login.email=3DEmail
 vradi.login.password=3DMot de passe

Modified: trunk/vradi-web/src/main/webapp/WEB-INF/jsp/resultGrid.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/resultGrid.jsp	2011-06-21 15:=
22:51 UTC (rev 89)
+++ trunk/vradi-web/src/main/webapp/WEB-INF/jsp/resultGrid.jsp	2011-06-22 09:=
37:50 UTC (rev 90)
@@ -1,10 +1,20 @@
 <%@ page import=3D"org.chorem.vradi.entities.Infogene" %>
 <%@ page import=3D"org.chorem.vradi.actions.SearchAction" %>
 <%@ page import=3D"com.opensymphony.xwork2.ActionContext" %>
+<%@ page import=3D"static org.nuiton.i18n.I18n._" %>
=20
 <%@taglib prefix=3D"s" uri=3D"/struts-tags"%>
 <%@taglib prefix=3D"sjg" uri=3D"/struts-jquery-grid-tags"%>
+<script type=3D"text/javascript">
=20
+/*
+ * Format a Column as Link
+ */
+function formatLink(cellvalue, options, row) {
+    return "<a href=3D'/formNote/" + cellvalue + ".action'><%=3D_("vradi.for=
m.editAction")%></a>";
+}
+</script>
+
 <%
 SearchAction action =3D SearchAction.getAction();
 String query =3D action.getQuery();
@@ -17,6 +27,9 @@
 <s:set id=3D"objetText">
     <s:text name=3D"vradi.form.object"/>
 </s:set>
+<s:set id=3D"actionText">
+    <s:text name=3D"vradi.form.action"/>
+</s:set>
 <s:set id=3D"fqCreationDate">
     <%=3DInfogene.FQ_FIELD_INFOGENE_CREATIONDATE%>
 </s:set>
@@ -42,16 +55,21 @@
           onSelectRowTopics=3D"rowselect">
=20
     <sjg:gridColumn name=3D"creationDate"
-                    index=3D"%{#fqCreationDate}"
-                    title=3D"%{#creationDateText}"
+                    index=3D"%{fqCreationDate}"
+                    title=3D"%{creationDateText}"
                     formatter=3D"date"
                     formatoptions=3D"{newformat : 'd/m/Y H:i', srcformat : '=
Y-m-d H:i:s'}"
                     sortable=3D"true"
                     width=3D"30"/>
=20
     <sjg:gridColumn name=3D"objet"
-                    index=3D"%{#fqObjet}"
-                    title=3D"%{#objetText}"
+                    index=3D"%{fqObjet}"
+                    title=3D"%{objetText}"
                     sortable=3D"true"/>
=20
+    <sjg:gridColumn name=3D"wikittyId"
+                    title=3D"%{actionText}"
+                    formatter=3D"formatLink"
+                    width=3D"10"/>
+
 </sjg:grid>
\ No newline at end of file


--===============3620955273267439316==--