r119 - in trunk: vradi-services/src/main/java/org/chorem/vradi/services vradi-web/src/main/java/org/chorem/vradi vradi-web/src/main/java/org/chorem/vradi/actions vradi-web/src/main/resources vradi-web/src/main/resources/i18n vradi-web/src/main/webapp/WEB-INF/jsp
Author: sletellier Date: 2011-07-11 17:00:08 +0200 (Mon, 11 Jul 2011) New Revision: 119 Url: http://chorem.org/repositories/revision/vradi/119 Log: - Fix formNote upload file - Fix formNote list attached files - Fix formNote attachedFile deletion - Reformat struts.xml - Format dates Modified: trunk/vradi-services/src/main/java/org/chorem/vradi/services/VradiStorageServiceImpl.java trunk/vradi-web/src/main/java/org/chorem/vradi/VradiWebHelper.java trunk/vradi-web/src/main/java/org/chorem/vradi/actions/AttachmentAddAction.java trunk/vradi-web/src/main/java/org/chorem/vradi/actions/VradiBaseAction.java 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/resources/struts.xml trunk/vradi-web/src/main/webapp/WEB-INF/jsp/attachmentList.jsp trunk/vradi-web/src/main/webapp/WEB-INF/jsp/formNote.jsp trunk/vradi-web/src/main/webapp/WEB-INF/jsp/formNoteList.jsp trunk/vradi-web/src/main/webapp/WEB-INF/jsp/userPreference.jsp Modified: trunk/vradi-services/src/main/java/org/chorem/vradi/services/VradiStorageServiceImpl.java =================================================================== --- trunk/vradi-services/src/main/java/org/chorem/vradi/services/VradiStorageServiceImpl.java 2011-07-11 08:47:49 UTC (rev 118) +++ trunk/vradi-services/src/main/java/org/chorem/vradi/services/VradiStorageServiceImpl.java 2011-07-11 15:00:08 UTC (rev 119) @@ -438,7 +438,6 @@ @Override public String sendMessages(String sessionId) throws VradiException { - return mailingManager.sendMessages(sessionId); } Modified: trunk/vradi-web/src/main/java/org/chorem/vradi/VradiWebHelper.java =================================================================== --- trunk/vradi-web/src/main/java/org/chorem/vradi/VradiWebHelper.java 2011-07-11 08:47:49 UTC (rev 118) +++ trunk/vradi-web/src/main/java/org/chorem/vradi/VradiWebHelper.java 2011-07-11 15:00:08 UTC (rev 119) @@ -3,8 +3,11 @@ import java.io.IOException; import java.io.UnsupportedEncodingException; import java.net.URLEncoder; +import java.text.SimpleDateFormat; +import java.util.Date; import java.util.Set; +import freemarker.template.SimpleDate; import org.apache.commons.codec.binary.Base64; import org.apache.commons.lang.StringUtils; import org.apache.commons.logging.Log; @@ -31,6 +34,12 @@ return txt.replaceAll("(?s)<script.*?>.*</script>", ""); } + public static String formatDate(Date date) { + SimpleDateFormat formater = new SimpleDateFormat("dd/MM/yyyy HH:mm"); + String format = formater.format(date); + return format; + } + /** * Compresse en gzip la string passee en parametre, la passe en base64 * et l'encode pour passer comme parametre d'une url Modified: trunk/vradi-web/src/main/java/org/chorem/vradi/actions/AttachmentAddAction.java =================================================================== --- trunk/vradi-web/src/main/java/org/chorem/vradi/actions/AttachmentAddAction.java 2011-07-11 08:47:49 UTC (rev 118) +++ trunk/vradi-web/src/main/java/org/chorem/vradi/actions/AttachmentAddAction.java 2011-07-11 15:00:08 UTC (rev 119) @@ -1,8 +1,8 @@ package org.chorem.vradi.actions; import java.io.File; -import java.io.FileInputStream; import java.util.Date; + import org.apache.commons.lang.StringUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -27,7 +27,7 @@ protected String attachmentId; protected String name; protected String description; - protected File file; + protected File content; protected String contentType; protected String filename; @@ -38,19 +38,27 @@ public String getTargetId() { return targetId; } - + public void setName(String name) { this.name = name; } + public String getName() { + return name; + } + public void setDescription(String description) { this.description = description; } - public void setFile(File file) { - this.file = file; + public String getDescription() { + return description; } + public void setContent(File content) { + this.content = content; + } + public void setFilename(String filename) { this.filename = filename; } @@ -72,8 +80,8 @@ attachment = proxy.restore(Attachment.class, attachmentId); } if (attachment != null) { - if (file != null) { - attachment.setContent(FileUtil.fileToByte(file)); + if (content != null) { + attachment.setContent(FileUtil.fileToByte(content)); attachment.setMimetype(contentType); attachment.setName(filename); } @@ -87,9 +95,8 @@ } // force la creation de la liste des attachments - super.execute(); + result = super.execute(); return result; } - } Modified: trunk/vradi-web/src/main/java/org/chorem/vradi/actions/VradiBaseAction.java =================================================================== --- trunk/vradi-web/src/main/java/org/chorem/vradi/actions/VradiBaseAction.java 2011-07-11 08:47:49 UTC (rev 118) +++ trunk/vradi-web/src/main/java/org/chorem/vradi/actions/VradiBaseAction.java 2011-07-11 15:00:08 UTC (rev 119) @@ -45,6 +45,11 @@ protected Map<String, Object> session; + @Override + public void setSession(Map<String, Object> session) { + this.session = session; + } + public VradiSession getVradiSession() { VradiSession result = VradiSession.getVradiSession(session); return result; @@ -72,11 +77,6 @@ } @Override - public void setSession(Map<String, Object> session) { - this.session = session; - } - - @Override public String getText(String aTextName) { String value = super.getText(aTextName); return getSafeText(aTextName, value); 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-07-11 08:47:49 UTC (rev 118) +++ trunk/vradi-web/src/main/resources/i18n/vradi-web_en_GB.properties 2011-07-11 15:00:08 UTC (rev 119) @@ -97,4 +97,7 @@ vradi.userPreference.nosend=No send vradi.userPreference.title=User preferences vradi.userPreference.note.open=Opened notes -vradi.userPreference.note.close=Closed notes \ No newline at end of file +vradi.userPreference.note.close=Closed notes +vradi.attachment.update=Update +vradi.attachment.history=History +vradi.attachment.delete=Delete \ 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-07-11 08:47:49 UTC (rev 118) +++ trunk/vradi-web/src/main/resources/i18n/vradi-web_fr_FR.properties 2011-07-11 15:00:08 UTC (rev 119) @@ -5,6 +5,9 @@ vradi.addfiles.content=Fichier à ajouter vradi.addfiles.description=Descrition du fichier vradi.addfiles.name=Nom du fichier +vradi.attachment.delete=Suppression +vradi.attachment.history=Historique +vradi.attachment.update=Mettre à jour vradi.authentification.error=Erreur lors de l'authentification vradi.config.configFileName.description=Fichier de configuration de Vradi web vradi.config.database.version.description=Version de la base de donnée Modified: trunk/vradi-web/src/main/resources/struts.xml =================================================================== --- trunk/vradi-web/src/main/resources/struts.xml 2011-07-11 08:47:49 UTC (rev 118) +++ trunk/vradi-web/src/main/resources/struts.xml 2011-07-11 15:00:08 UTC (rev 119) @@ -23,8 +23,8 @@ <result-type name="json" class="org.apache.struts2.json.JSONResult"/> <!-- FIXME sletellier 20110708 : in this case, gridModel is not serialized :(, try to find a better way--> <!--<result-type name="tableModel-json" class="org.apache.struts2.json.JSONResult">--> - <!--<param name="ignoreHierarchy">false</param>--> - <!--<param name="includeProperties">gridModel,rows,page,sord,sidx,searchField,searchString,searchOper,total,records</param>--> + <!--<param name="ignoreHierarchy">false</param>--> + <!--<param name="includeProperties">gridModel,rows,page,sord,sidx,searchField,searchString,searchOper,total,records</param>--> <!--</result-type>--> <result-type name="tableModel-json" class="org.apache.struts2.json.JSONResult"> <param name="ignoreHierarchy">false</param> @@ -33,8 +33,8 @@ <param name="excludeProperties">formPagedResult,vradiSession,user,proxy,dataService,config,session,text,safeText,actionErrors,actionMessages,errorMessages,errors,fieldErrors,locale,texts,textProvider,container</param> </result-type> <result-type name="wikitty-json" class="org.apache.struts2.json.JSONResult"> - <param name="includeProperties">id,extensionNames\[\d+\],fieldValue\..*\..*</param> - <param name="root">wikitty</param> + <param name="includeProperties">id,extensionNames\[\d+\],fieldValue\..*\..*</param> + <param name="root">wikitty</param> </result-type> </result-types> <interceptors> @@ -43,9 +43,9 @@ <!-- display errors in logger --> <interceptor-ref name="exception"> - <param name="logEnabled">true</param> - <param name="logCategory">org.chorem.vradi</param> - <param name="logLevel">ERROR</param> + <param name="logEnabled">true</param> + <param name="logCategory">org.chorem.vradi</param> + <param name="logLevel">ERROR</param> </interceptor-ref> <interceptor-ref name="defaultStack"/> <interceptor-ref name="json"> @@ -170,7 +170,7 @@ | Affiche le détail du formulaire +--> <action name="formView/*" class="org.chorem.vradi.actions.FormViewAction"> - <param name="formId">{1}</param> + <param name="formId">{1}</param> <result>/WEB-INF/jsp/formView.jsp</result> </action> @@ -179,28 +179,28 @@ | Permet de creer une nouvelle note +--> <action name="formNoteList/*" class="org.chorem.vradi.actions.FormNoteListAction"> - <param name="formId">{1}</param> + <param name="formId">{1}</param> <result>/WEB-INF/jsp/formNoteList.jsp</result> </action> <!-- | Affiche la note demande, si l'id n'existe pas une nouvelle note est creee +--> <action name="formNote/*" class="org.chorem.vradi.actions.FormNoteAction"> - <param name="formNoteId">{1}</param> + <param name="formNoteId">{1}</param> <result>/WEB-INF/jsp/formNote.jsp</result> </action> <!-- | Affiche la page de preference de l'utilisateur +--> <action name="userPreference/*" class="org.chorem.vradi.actions.RestoreUserAction"> - <param name="userId">{1}</param> + <param name="userId">{1}</param> <result>/WEB-INF/jsp/userPreference.jsp</result> </action> <!-- | Affiche la page de recherche de partenaire +--> <action name="seekPartners/*" class="org.chorem.vradi.actions.SeekPartnersAction"> - <param name="noteId">{1}</param> + <param name="noteId">{1}</param> <result>/WEB-INF/jsp/seekPartners.jsp</result> </action> <!-- @@ -226,38 +226,39 @@ | genere la liste de attachment associe a l'id passer par le parametre targetId +--> <action name="attachmentAdd" class="org.chorem.vradi.actions.AttachmentAddAction"> - <result>/WEB-INF/jsp/attachmentList.jsp</result> + <result name="input">/WEB-INF/jsp/attachmentList.jsp</result> + <result>/WEB-INF/jsp/attachmentList.jsp</result> </action> <!-- | genere la liste de attachment associe a l'id passer par le parametre targetId +--> <action name="attachmentList/*" class="org.chorem.vradi.actions.AttachmentListAction"> - <param name="targetId">{1}</param> - <result>/WEB-INF/jsp/attachmentList.jsp</result> + <param name="targetId">{1}</param> + <result>/WEB-INF/jsp/attachmentList.jsp</result> </action> <!-- | genere la liste de attachment associe a l'id passer par le parametre targetId +--> <action name="userInfo" class="org.chorem.vradi.actions.RestoreUserAction"> - <result>/WEB-INF/jsp/userInfo.jsp</result> + <result>/WEB-INF/jsp/userInfo.jsp</result> </action> <!-- | genere un thesaurus filtre +--> - <action name="thesaurusFilter" class="org.chorem.vradi.actions.ThesaurusAction" method="filter"> - <result>/WEB-INF/jsp/thesaurusFilter.jsp</result> + <action name="thesaurusFilter" method="filter" class="org.chorem.vradi.actions.ThesaurusAction"> + <result>/WEB-INF/jsp/thesaurusFilter.jsp</result> </action> <!-- | genere le formulaire de recherche +--> <action name="refreshForm" method="refreshForm" class="org.chorem.vradi.actions.SearchAction"> - <result>/WEB-INF/jsp/empty.jsp</result> + <result>/WEB-INF/jsp/empty.jsp</result> </action> <!-- | genere le formulaire de recherche +--> <action name="searchPanel" method="refreshForm" class="org.chorem.vradi.actions.SearchAction"> - <result>/WEB-INF/jsp/searchPanel.jsp</result> + <result>/WEB-INF/jsp/searchPanel.jsp</result> </action> <!-- | Search @@ -277,7 +278,7 @@ | genere la grille des resultats +--> <action name="search" class="org.chorem.vradi.actions.SearchAction"> - <result>/WEB-INF/jsp/resultGrid.jsp</result> + <result>/WEB-INF/jsp/resultGrid.jsp</result> </action> <!-- @@ -298,42 +299,43 @@ | parametre 'rst' +--> <action name="raw/*/*" class="org.chorem.vradi.actions.RawAction"> - <param name="id">{1}</param> - <param name="fqField">{2}</param> - <param name="includes">Attachment\.content</param> - <result type="stream"> - <param name="contentDisposition">filename="${filename}"</param> - <param name="contentType">${mimeType}</param> - <param name="inputName">content</param> - </result> + <param name="id">{1}</param> + <param name="fqField">{2}</param> + <param name="includes">Attachment\.content</param> + <result type="stream"> + <param name="contentDisposition">filename="${filename}"</param> + <param name="contentType">${mimeType}</param> + <param name="inputName">content</param> + </result> </action> <!-- | Essai de generer du HTML a partir d'un champs d'un objet ou du | parametre 'rst' +--> <action name="rst" class="org.chorem.vradi.actions.RSTAction"> - <param name="includes">FormNote\.summary,FormNote\.content,VradiUser\.info</param> - <result type="stream"> - <param name="contentType">${mimeType}</param> - <param name="inputName">rstResult</param> - </result> + <param name="includes">FormNote\.summary,FormNote\.content,VradiUser\.info</param> + <result type="stream"> + <param name="contentType">${mimeType}</param> + <param name="inputName">rstResult</param> + </result> </action> <!-- | Edit n'importe qu'elle objet en modifiant les valeurs des champs retrouve | en parametre +--> <action name="edit/*" class="org.chorem.vradi.actions.EditAction"> - <param name="id">{1}</param> - <param name="includes">FormNote\..*,VradiUser\..*</param> - <result type="wikitty-json"/> + <param name="id">{1}</param> + <param name="includes">FormNote\..*,VradiUser\..*</param> + <result type="wikitty-json"/> </action> <!-- | Supprime n'importe qu'elle objet ou champs d'un objet (remise a null) +--> <action name="delete/*" class="org.chorem.vradi.actions.DeleteAction"> - <param name="id">{1}</param> - <param name="includes">FormNote</param> - <result>/WEB-INF/jsp/empty.jsp</result> + <param name="id">{1}</param> + <param name="includes">FormNote, Attachment</param> + <result>/WEB-INF/jsp/empty.jsp</result> + <result name="error">/WEB-INF/jsp/empty.jsp</result> </action> </package> Modified: trunk/vradi-web/src/main/webapp/WEB-INF/jsp/attachmentList.jsp =================================================================== --- trunk/vradi-web/src/main/webapp/WEB-INF/jsp/attachmentList.jsp 2011-07-11 08:47:49 UTC (rev 118) +++ trunk/vradi-web/src/main/webapp/WEB-INF/jsp/attachmentList.jsp 2011-07-11 15:00:08 UTC (rev 119) @@ -7,6 +7,7 @@ <%@page import="com.opensymphony.xwork2.ActionContext"%> <%@page import="org.chorem.vradi.entities.Attachment"%> <%@page import="org.chorem.vradi.actions.AttachmentListAction"%> +<%@ page import="org.chorem.vradi.VradiWebHelper" %> <%@page contentType="text/html" pageEncoding="UTF-8"%> <%@taglib prefix="s" uri="/struts-tags"%> @@ -16,23 +17,30 @@ AttachmentListAction action = AttachmentListAction.getAction(); %> -<div id="actionResult" style="display: none;"></div> +<div id="actionResult" hidden="true"> + <img id="indicator-deleteAttachment" src="/img/indicator.gif" alt="deleting..." style="display:none"/> +</div> <ul> - <% for (Attachment a : action.getAttachments()) { - ActionContext.getContext().put("localAttachmentId", a.getWikittyId()); - %> + <% for (Attachment a : action.getAttachments()) { + if (a != null) { + String attachmentId = a.getWikittyId(); + ActionContext.getContext().put("localAttachmentId", attachmentId); + %> - <li><%=a.getDate()%><a href="/ajax/raw/<%=a.getWikittyId()%>/Attachment.content.action"><%=a.getName()%></a> + <li><%=VradiWebHelper.formatDate(a.getDate())%> <a href="/ajax/raw/<%=attachmentId%>/Attachment.content.action"><%=a.getName()%></a> - <s:a action="/ajax/raw/%{}/Attachment.content" key="vradi.attachment.update"></s:a> - <s:a action="" key="vradi.attachment.history"></s:a> - <sj:a id="deleteAttachment-%{localAttachmentId}" href="/ajax/delete/%{localAttachmentId}" - targets="actionResult" indicator="indicator-deleteAttachment-%{localAttachmentId}" - button="true" buttonIcon="ui-icon-gear"> - <s:text name="vradi.attachment.delete"/> - </sj:a> - <img id="indicator-deleteAttachment-<%=a.getWikittyId()%>" src="/img/indicator.gif" alt="deleting..." style="display:none"/> - </li> - <% } %> + <%--<s:a action="/ajax/raw/%{localAttachmentId}/Attachment.content" key="vradi.attachment.update"></s:a>--%> + <%--<s:a action="" key="vradi.attachment.history"></s:a>--%> + <sj:a href="/ajax/delete/%{localAttachmentId}.action" + targets="actionResult" + button="true" + indicator="indicator-deleteAttachment" + onSuccessTopics="updateFiles" + buttonIcon="ui-icon-gear"> + <s:text name="vradi.attachment.delete"/> + </sj:a> + </li> + <% } + } %> </ul> Modified: trunk/vradi-web/src/main/webapp/WEB-INF/jsp/formNote.jsp =================================================================== --- trunk/vradi-web/src/main/webapp/WEB-INF/jsp/formNote.jsp 2011-07-11 08:47:49 UTC (rev 118) +++ trunk/vradi-web/src/main/webapp/WEB-INF/jsp/formNote.jsp 2011-07-11 15:00:08 UTC (rev 119) @@ -7,6 +7,7 @@ <%@page import="com.opensymphony.xwork2.ActionContext"%> <%@page import="org.chorem.vradi.entities.FormNote"%> <%@page import="org.chorem.vradi.actions.FormNoteAction"%> +<%@ page import="org.chorem.vradi.entities.FormNoteState" %> <%@page contentType="text/html" pageEncoding="UTF-8"%> @@ -37,18 +38,19 @@ </head> <body> <h1><s:text name="vradi.formNote.title" /></h1> - <div id="result"> + <div id="result" hidden="true"> <img id="indicator-result" src="/img/indicator.gif" alt="Loading..." style="display:none"/> </div> <div> - <sj:a id="closeButton" href="/ajax/edit/%{localNoteId}.action?state=close" - targets="" indicator="indicator-result" + <sj:a id="closeButton" href="/ajax/edit/%{localNoteId}.action?state=<%=FormNoteState.CLOSE.getValue()%>>" + targets="result" indicator="indicator-result" button="true" buttonIcon="ui-icon-gear"> <s:text name="vradi.formNote.close"/> </sj:a> - <s:a action="formNoteEdit/%{localNoteId}?state=close"><s:text name="vradi.formNote.close" /></s:a> - <s:a action="delete/%{localNoteId}"><s:text name="vradi.delete" /></s:a> + <sj:a href="/ajax/delete/%{localNoteId}.action" + targets="result" indicator="indicator-result" + button="true" buttonIcon="ui-icon-gear"><s:text name="vradi.delete"/></sj:a> </div> <div> @@ -125,18 +127,23 @@ collapsible="true" useSelectedTabCookie="true"> <sj:tab id="tabHtmlContent" target="htmlContent" label="%{summaryText}"/> <sj:tab id="tabHtmlContentEdit" target="htmlContentEdit" label="%{editText}"/> - <div id="htmlContent"> + <sj:div id="htmlContent" + href="/ajax/rst.action?id=%{localNoteId}&field=%{localFieldContent}" + listenTopics="updateHtmlContent"> <img id="indicator-htmlContent" src="/img/indicator.gif" alt="Loading..." style="display:none"/> - <%=action.getContent()%> - </div> + </sj:div> + <%--<div id="htmlContent">--%> + <%--<img id="indicator-htmlContent" src="/img/indicator.gif" alt="Loading..." style="display:none"/>--%> + <%--</div>--%> <div id="htmlContentEdit" > - <form id="htmlContentEditForm" action="/ajax/edit.action"> + <form id="htmlContentEditForm" action="/ajax/rst.action"> <s:hidden name="id" value="%{localNoteId}"/> - <s:hidden name="field" value="%{localFieldSummary}"/> - <s:textarea name="content" value="%{localContent}"/> - <sj:submit id="htmlContentEditSubmit" formIds="htmlContentEditForm" + <s:hidden name="field" value="%{localFieldContent}"/> + <s:textarea name="rst" value="%{localContent}"/> + <sj:submit id="htmlContentEditSubmit" value="%{saveText}" - targets="htmlContent" + targets="result" + onSuccessTopics="updateHtmlContent" indicator="indicator-htmlContent" button="true" buttonIcon="ui-icon-gear"/> </form> @@ -159,21 +166,23 @@ <sj:tab id="tabAddFiles" target="addFiles" label="%{addText}"/> <div id="files"> <sj:div href="/fragment/attachmentList/%{localNoteId}.action" - indicator="indicator-files"> + indicator="indicator-files" + listenTopics="updateFiles"> <img id="indicator-files" src="/img/indicator.gif" alt="Loading..." style="display:none"/> </sj:div> </div> <div id="addFiles"> - <s:form id="addFilesForm" action="/fragment/attachmentAdd.action" enctype="multipart/form-data"> + <s:form id="addFilesForm" namespace="/fragment" action="attachmentAdd" method="POST" enctype="multipart/form-data"> + <%--<s:form id="addFilesForm" action="attachmentAdd" method="POST" enctype="multipart/form-data">--%> <s:hidden name="targetId" value="%{localNoteId}"/> <s:textfield name="name" key="vradi.addfiles.name"/> <s:textarea name="description" key="vradi.addfiles.description"/> <s:file name="content" key="vradi.addfiles.content" required="true"/> - <sj:submit id="addFilesSubmit" formIds="addFilesForm" - value="%{saveText}" - targets="files" onSuccessTopics="" - indicator="indicator-addFiles" - button="true" buttonIcon="ui-icon-gear"/> + <sj:submit id="addFilesSubmit" + value="%{saveText}" + targets="result" onSuccessTopics="updateFiles" + indicator="indicator-addFiles" + button="true" buttonIcon="ui-icon-gear"/> </s:form> <img id="indicator-addFiles" src="/img/indicator.gif" alt="Loading..." style="display:none"/> </div> Modified: trunk/vradi-web/src/main/webapp/WEB-INF/jsp/formNoteList.jsp =================================================================== --- trunk/vradi-web/src/main/webapp/WEB-INF/jsp/formNoteList.jsp 2011-07-11 08:47:49 UTC (rev 118) +++ trunk/vradi-web/src/main/webapp/WEB-INF/jsp/formNoteList.jsp 2011-07-11 15:00:08 UTC (rev 119) @@ -7,6 +7,7 @@ <%@page import="com.opensymphony.xwork2.ActionContext"%> <%@page import="org.chorem.vradi.entities.FormNote"%> <%@page import="org.chorem.vradi.actions.FormNoteListAction"%> +<%@ page import="org.chorem.vradi.VradiWebHelper" %> <%@page contentType="text/html" pageEncoding="UTF-8"%> <%@taglib prefix="s" uri="/struts-tags"%> @@ -27,7 +28,7 @@ <% for (FormNote note : action.getFormNotes()) { ActionContext.getContext().put("localNoteId", note.getWikittyId()); %> - <li><s:a action="formNote/%{localNoteId}"><%=note.getCreationDate()%> <%=note.getSummary()%></s:a></li> + <li><s:a action="formNote/%{localNoteId}"><%=VradiWebHelper.formatDate(note.getCreationDate())%> <%=note.getSummary()%></s:a></li> <% } %> <li><s:a action="formNote/new?formId=%{formId}"><s:text name="vradi.new.formNote"/></s:a></li> </ul> Modified: trunk/vradi-web/src/main/webapp/WEB-INF/jsp/userPreference.jsp =================================================================== --- trunk/vradi-web/src/main/webapp/WEB-INF/jsp/userPreference.jsp 2011-07-11 08:47:49 UTC (rev 118) +++ trunk/vradi-web/src/main/webapp/WEB-INF/jsp/userPreference.jsp 2011-07-11 15:00:08 UTC (rev 119) @@ -19,7 +19,6 @@ <% RestoreUserAction action = RestoreUserAction.getAction(); VradiUser user = action.getUser(); -//ActionContext.getContext().put("user", WikittyUtil.getWikitty(action.getProxy().getWikittyService(), null, action.getUser())); ActionContext.getContext().put("localUserId", user.getWikittyId()); ActionContext.getContext().put("localUserEmail", user.getLogin()); ActionContext.getContext().put("localUserInfo", user.getInfo()); @@ -48,6 +47,7 @@ function formatLink(cellvalue, options, row) { return "<a href='/formNoteList/" + cellvalue + ".action'><%=_("vradi.form.editAction")%></a>"; } + <%-- Table --%> $.subscribe('rowselect', function(event, data) { var id = event.originalEvent.id;
participants (1)
-
sletellier＠users.chorem.org