r90 - in trunk/vradi-web/src/main: resources/i18n webapp/WEB-INF/jsp
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 =================================================================== --- trunk/vradi-web/src/main/resources/i18n/vradi-web_en_GB.properties 2011-06-21 15:22:51 UTC (rev 89) +++ trunk/vradi-web/src/main/resources/i18n/vradi-web_en_GB.properties 2011-06-22 09:37:50 UTC (rev 90) @@ -38,4 +38,6 @@ vradi.search.queryName=Request name vradi.search.saveQuery=Save request vradi.formView.title=Form view -vradi.search.thesaurusFilterButton=Filter \ No newline at end of file +vradi.search.thesaurusFilterButton=Filter +vradi.form.editAction=Edit +vradi.form.action=Action \ No newline at end of file Modified: trunk/vradi-web/src/main/resources/i18n/vradi-web_fr_FR.properties =================================================================== --- trunk/vradi-web/src/main/resources/i18n/vradi-web_fr_FR.properties 2011-06-21 15:22:51 UTC (rev 89) +++ trunk/vradi-web/src/main/resources/i18n/vradi-web_fr_FR.properties 2011-06-22 09:37:50 UTC (rev 90) @@ -14,7 +14,9 @@ vradi.forgotPassword.emailDoesntExist=Cette adresse email n'existe pas vradi.forgotpwd.submit=Envoyer vradi.forgotpwd.title=Vous avez oublié votre mot de passe ? +vradi.form.action=Action vradi.form.creationDate=Date de création +vradi.form.editAction=Editer vradi.form.object=Objet vradi.login.email=Email vradi.login.password=Mot de passe Modified: trunk/vradi-web/src/main/webapp/WEB-INF/jsp/resultGrid.jsp =================================================================== --- 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="org.chorem.vradi.entities.Infogene" %> <%@ page import="org.chorem.vradi.actions.SearchAction" %> <%@ page import="com.opensymphony.xwork2.ActionContext" %> +<%@ page import="static org.nuiton.i18n.I18n._" %> <%@taglib prefix="s" uri="/struts-tags"%> <%@taglib prefix="sjg" uri="/struts-jquery-grid-tags"%> +<script type="text/javascript"> +/* + * Format a Column as Link + */ +function formatLink(cellvalue, options, row) { + return "<a href='/formNote/" + cellvalue + ".action'><%=_("vradi.form.editAction")%></a>"; +} +</script> + <% SearchAction action = SearchAction.getAction(); String query = action.getQuery(); @@ -17,6 +27,9 @@ <s:set id="objetText"> <s:text name="vradi.form.object"/> </s:set> +<s:set id="actionText"> + <s:text name="vradi.form.action"/> +</s:set> <s:set id="fqCreationDate"> <%=Infogene.FQ_FIELD_INFOGENE_CREATIONDATE%> </s:set> @@ -42,16 +55,21 @@ onSelectRowTopics="rowselect"> <sjg:gridColumn name="creationDate" - index="%{#fqCreationDate}" - title="%{#creationDateText}" + index="%{fqCreationDate}" + title="%{creationDateText}" formatter="date" formatoptions="{newformat : 'd/m/Y H:i', srcformat : 'Y-m-d H:i:s'}" sortable="true" width="30"/> <sjg:gridColumn name="objet" - index="%{#fqObjet}" - title="%{#objetText}" + index="%{fqObjet}" + title="%{objetText}" sortable="true"/> + <sjg:gridColumn name="wikittyId" + title="%{actionText}" + formatter="formatLink" + width="10"/> + </sjg:grid> \ No newline at end of file
participants (1)
-
sletellier@users.chorem.org