May 2011 - Vradi-commits - mailman.cloud.codelutin.com

r52 - in trunk: . vradi-web vradi-web/src/main/java/org/chorem/vradi/actions vradi-web/src/main/resources vradi-web/src/main/webapp/WEB-INF/jsp
by bpoussin＠users.chorem.org 26 May '11

26 May '11

Author: bpoussin Date: 2011-05-26 11:46:08 +0200 (Thu, 26 May 2011) New Revision: 52 Url: http://chorem.org/repositories/revision/vradi/52 Log: - add jquery plugin (better than dojo) - add rst action (generate from rst and set field if necessary) - add AbstractEditAction used for EditAction and RSTAction to filter acceptable wikitty field Added: trunk/vradi-web/src/main/java/org/chorem/vradi/actions/AbstractEditAction.java trunk/vradi-web/src/main/java/org/chorem/vradi/actions/RSTAction.java Modified: trunk/pom.xml trunk/vradi-web/pom.xml trunk/vradi-web/src/main/java/org/chorem/vradi/actions/EditAction.java trunk/vradi-web/src/main/java/org/chorem/vradi/actions/FormNoteAction.java trunk/vradi-web/src/main/resources/struts.properties trunk/vradi-web/src/main/webapp/WEB-INF/jsp/formNote.jsp Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2011-05-25 16:58:41 UTC (rev 51) +++ trunk/pom.xml 2011-05-26 09:46:08 UTC (rev 52) @@ -120,6 +120,7 @@ <javamailVersion>1.4.3</javamailVersion> <slf4jVersion>1.6.1</slf4jVersion> <struts2Version>2.2.3</struts2Version> + <struts2jqueryVersion>3.0.1</struts2jqueryVersion> <servletApiVersion>2.5</servletApiVersion> <jspApiVersion>2.0</jspApiVersion> @@ -421,6 +422,32 @@ </dependency> <dependency> + <groupId>com.jgeppert.struts2.jquery</groupId> + <artifactId>struts2-jquery-plugin</artifactId> + <version>${struts2jqueryVersion}</version> + </dependency> + <dependency> + <groupId>com.jgeppert.struts2.jquery</groupId> + <artifactId>struts2-jquery-grid-plugin</artifactId> + <version>${struts2jqueryVersion}</version> + </dependency> + <dependency> + <groupId>com.jgeppert.struts2.jquery</groupId> + <artifactId>struts2-jquery-richtext-plugin</artifactId> + <version>${struts2jqueryVersion}</version> + </dependency> + <dependency> + <groupId>com.jgeppert.struts2.jquery</groupId> + <artifactId>struts2-jquery-tree-plugin</artifactId> + <version>${struts2jqueryVersion}</version> + </dependency> + <dependency> + <groupId>com.jgeppert.struts2.jquery</groupId> + <artifactId>struts2-jquery-mobile-plugin</artifactId> + <version>${struts2jqueryVersion}</version> + </dependency> + + <dependency> <groupId>org.apache.struts</groupId> <artifactId>struts2-dojo-plugin</artifactId> <version>${struts2Version}</version> Modified: trunk/vradi-web/pom.xml =================================================================== --- trunk/vradi-web/pom.xml 2011-05-25 16:58:41 UTC (rev 51) +++ trunk/vradi-web/pom.xml 2011-05-26 09:46:08 UTC (rev 52) @@ -86,6 +86,27 @@ </dependency> <dependency> + <groupId>com.jgeppert.struts2.jquery</groupId> + <artifactId>struts2-jquery-plugin</artifactId> + </dependency> + <dependency> + <groupId>com.jgeppert.struts2.jquery</groupId> + <artifactId>struts2-jquery-grid-plugin</artifactId> + </dependency> + <dependency> + <groupId>com.jgeppert.struts2.jquery</groupId> + <artifactId>struts2-jquery-richtext-plugin</artifactId> + </dependency> + <dependency> + <groupId>com.jgeppert.struts2.jquery</groupId> + <artifactId>struts2-jquery-tree-plugin</artifactId> + </dependency> + <dependency> + <groupId>com.jgeppert.struts2.jquery</groupId> + <artifactId>struts2-jquery-mobile-plugin</artifactId> + </dependency> + + <dependency> <groupId>org.apache.struts</groupId> <artifactId>struts2-dojo-plugin</artifactId> <scope>runtime</scope> Added: trunk/vradi-web/src/main/java/org/chorem/vradi/actions/AbstractEditAction.java =================================================================== --- trunk/vradi-web/src/main/java/org/chorem/vradi/actions/AbstractEditAction.java (rev 0) +++ trunk/vradi-web/src/main/java/org/chorem/vradi/actions/AbstractEditAction.java 2011-05-26 09:46:08 UTC (rev 52) @@ -0,0 +1,99 @@ +package org.chorem.vradi.actions; + +import java.util.Arrays; +import java.util.List; +import org.apache.commons.collections.CollectionUtils; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; + +/** + * Looking for if fqfield match excludes and includes pattern list. + * <p> + * action param: + * <li>excludes: comma separated list of pattern + * <li>includes: comma separated list of pattern + * + * <p> + * sub classes can use isAcceptable(String) to know if field is accepted or not + * + * Exclude property expressions take precedence over includes property + * expressions. That is, if you use includes and excludes property expressions + * on the same result, includes property expressions will not be applied if an + * excludes excludes property expression matches a property first. + * + * @author poussin + * @version $Revision$ + * + * Last update: $Date$ + * by : $Author$ + */ +public abstract class AbstractEditAction extends VradiBaseAction { + + /** to use log facility, just put in your code: log.info(\"...\"); */ + static private Log log = LogFactory.getLog(AbstractEditAction.class); + + protected List<String> excludes; + protected List<String> includes; + + /** + * + * @param includes comma seperated list of pattern + */ + public void setExcludes(String excludeString) { + // remove all blank and newline + excludeString = excludeString.replaceAll("\\s", ""); + String[] excludeTab = excludeString.split(","); + this.excludes = Arrays.asList(excludeTab); + } + + /** + * + * @param includes comma seperated list of pattern + */ + public void setIncludes(String includeString) { + // remove all blank and newline + includeString = includeString.replaceAll("\\s", ""); + String[] includeTab = includeString.split(","); + this.includes = Arrays.asList(includeTab); + } + + protected boolean isAcceptable(String fqfield) { + Boolean result = null; + if (CollectionUtils.isEmpty(includes) && CollectionUtils.isEmpty(excludes)) { + // si pas de precission, on accepte tout + result = Boolean.TRUE; + } else { + // les excludes sont prioritaires + if (!CollectionUtils.isEmpty(excludes)) { + for (String ex : excludes) { + if (fqfield.matches(ex)) { + result = Boolean.FALSE; + break; + } + } + } + if (result == null) { + if (!CollectionUtils.isEmpty(includes)) { + // si pas dans les excludes, on regarde dans les includes + // vu qu'on a des includes, par defaut si on ne trouve pas + // d'includes qui match le fqfield, on retourne false + result = Boolean.FALSE; + for (String in : includes) { + if (fqfield.matches(in)) { + result = Boolean.TRUE; + break; + } + } + } else { + // pas de includes, donc tout est vrai + result = Boolean.TRUE; + } + } + } + log.debug(String.format( + "Accept field '%s' is %s with excludes: %s and includes: %s", + fqfield, result, excludes, includes)); + return result; + } + +} Modified: trunk/vradi-web/src/main/java/org/chorem/vradi/actions/EditAction.java =================================================================== --- trunk/vradi-web/src/main/java/org/chorem/vradi/actions/EditAction.java 2011-05-25 16:58:41 UTC (rev 51) +++ trunk/vradi-web/src/main/java/org/chorem/vradi/actions/EditAction.java 2011-05-26 09:46:08 UTC (rev 52) @@ -1,7 +1,6 @@ package org.chorem.vradi.actions; import com.opensymphony.xwork2.ActionContext; -import javax.servlet.ServletRequest; import javax.servlet.http.HttpServletRequest; import org.apache.commons.lang.StringUtils; import org.apache.commons.logging.Log; @@ -19,7 +18,7 @@ * Last update: $Date$ * by : $Author$ */ -public class EditAction extends VradiBaseAction implements ServletRequestAware { +public class EditAction extends AbstractEditAction implements ServletRequestAware { /** to use log facility, just put in your code: log.info(\"...\"); */ static private Log log = LogFactory.getLog(EditAction.class); @@ -29,19 +28,10 @@ } /** restraint les modifications possibles sur certaine extension */ - protected String restrictedExtension; protected HttpServletRequest request; protected String id; protected Wikitty wikitty; - public String getRestrictedExtension() { - return restrictedExtension; - } - - public void setRestrictedExtension(String restrictedExtension) { - this.restrictedExtension = restrictedExtension; - } - @Override public void setServletRequest(HttpServletRequest request) { this.request = request; @@ -59,21 +49,6 @@ return wikitty; } - protected boolean isAcceptableExtension(String fqfield) { - boolean result = false; - if (StringUtils.isBlank(restrictedExtension)) { - result = true; - } else { - try { - String extName = WikittyExtension.extractExtensionName(fqfield); - result = restrictedExtension.contains(extName); - } catch(Exception eee) { - log.debug("Not acceptable extension format", eee); - } - } - return result; - } - @Override public String execute() throws Exception { String result = SUCCESS; @@ -84,7 +59,7 @@ for (Object key : request.getParameterMap().keySet()) { String k = String.valueOf(key); log.debug(String.format("Look for field(%s)", k)); - if (wikitty.hasField(k) && isAcceptableExtension(k)) { + if (wikitty.hasField(k) && isAcceptable(k)) { Object v = request.getParameter(k); log.debug(String.format("Put value(%s) in field(%s)", v, k)); wikitty.setFqField(k, v); Modified: trunk/vradi-web/src/main/java/org/chorem/vradi/actions/FormNoteAction.java =================================================================== --- trunk/vradi-web/src/main/java/org/chorem/vradi/actions/FormNoteAction.java 2011-05-25 16:58:41 UTC (rev 51) +++ trunk/vradi-web/src/main/java/org/chorem/vradi/actions/FormNoteAction.java 2011-05-26 09:46:08 UTC (rev 52) @@ -114,13 +114,13 @@ // Render JRST in HTML try { - summary = JRST.generate(JRST.TYPE_HTML, formNote.getSummary()); + summary = JRST.generate(JRST.TYPE_HTML_INNER_BODY, formNote.getSummary()); } catch(Exception eee) { log.info("Can't generate HTML from RST", eee); summary = formNote.getSummary(); } try { - content = JRST.generate(JRST.TYPE_HTML, formNote.getContent()); + content = JRST.generate(JRST.TYPE_HTML_INNER_BODY, formNote.getContent()); } catch(Exception eee) { log.info("Can't generate HTML from RST", eee); content = formNote.getContent(); Added: trunk/vradi-web/src/main/java/org/chorem/vradi/actions/RSTAction.java =================================================================== --- trunk/vradi-web/src/main/java/org/chorem/vradi/actions/RSTAction.java (rev 0) +++ trunk/vradi-web/src/main/java/org/chorem/vradi/actions/RSTAction.java 2011-05-26 09:46:08 UTC (rev 52) @@ -0,0 +1,122 @@ +package org.chorem.vradi.actions; + +import java.io.InputStream; +import java.io.StringBufferInputStream; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.nuiton.jrst.JRST; +import org.nuiton.wikitty.WikittyProxy; +import org.nuiton.wikitty.entities.Wikitty; +import org.nuiton.wikitty.entities.WikittyExtension; + +/** + * Convert rst string in other format. Default format is + * {@link JRST#TYPE_HTML_INNER_BODY} + * <p> + * algo: + * <li> if {@link #id} and {@link #field} is present and {@link #rst} is present + * this field is set with rst value. + * <li> rst is set with field value (if field is present) + * <li> rst is converted in rstResultType and result is put in rstResult + * + * @author poussin + * @version $Revision$ + * + * Last update: $Date$ + * by : $Author$ + */ +public class RSTAction extends AbstractEditAction { + + /** to use log facility, just put in your code: log.info(\"...\"); */ + static private Log log = LogFactory.getLog(RSTAction.class); + + /** optional: wikitty id */ + protected String id; + /** optional: fq wikitty field */ + protected String field; + /** optionnal rst string */ + protected String rst; + /** result stream */ + protected InputStream rstResult; + /** rstResultType */ + protected String rstResultType = JRST.TYPE_HTML_INNER_BODY; + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getField() { + return field; + } + + public void setField(String field) { + this.field = field; + } + + public String getRst() { + return rst; + } + + public void setRst(String rst) { + this.rst = rst; + } + + public String getRstResultType() { + return rstResultType; + } + + public void setRstResultType(String rstResultType) { + this.rstResultType = rstResultType; + } + + public InputStream getRstResult() { + return rstResult; + } + + public String getMimeType() { + String result = JRST.getMimeType(getRstResultType()); + return result; + } + + @Override + public String execute() throws Exception { + // si on arrive pas a lire l'objet ou le champs on renvoie ca + try { + if (isAcceptable(field)) { + WikittyProxy proxy = getProxy(); + Wikitty w = proxy.restore(getId()); + String ext = WikittyExtension.extractExtensionName(field); + String fieldName = WikittyExtension.extractFieldName(field); + + if (rst != null) { + // rst est renseigne, on commence par mettre a jour le champs + w.setField(ext, fieldName, rst); + proxy.store(w); + } + // on recupere la valeur du champs + rst = w.getFieldAsString(ext, fieldName); + + // si on arrive pas a faire la generation a partir du champs + // on renvoi le champs en brut + rst = JRST.generate(rstResultType, rst); + } else { + rst = "<pre>Not acceptable field</pre>"; + } + } catch(Exception eee) { + log.info("Can't generate HTML from RST", eee); + // on a pas reussi a genere le HTML, le texte doit donc etre mis + // dans un element <pre> pour une meilleur presentation + if (rst == null) { + rst = "Can't be generate"; + } + rst = "<pre>" + rst + "</pre>"; + } + rstResult = new StringBufferInputStream(rst); + return SUCCESS; + } + +} Modified: trunk/vradi-web/src/main/resources/struts.properties =================================================================== --- trunk/vradi-web/src/main/resources/struts.properties 2011-05-25 16:58:41 UTC (rev 51) +++ trunk/vradi-web/src/main/resources/struts.properties 2011-05-26 09:46:08 UTC (rev 52) @@ -24,7 +24,7 @@ struts.i18n.reload=true -struts.ui.theme=xhtml +struts.ui.theme=css_xhtml struts.ui.templateDir=template #sets the default template type. Either ftl, vm, or jsp struts.ui.templateSuffix=ftl Modified: trunk/vradi-web/src/main/webapp/WEB-INF/jsp/formNote.jsp =================================================================== --- trunk/vradi-web/src/main/webapp/WEB-INF/jsp/formNote.jsp 2011-05-25 16:58:41 UTC (rev 51) +++ trunk/vradi-web/src/main/webapp/WEB-INF/jsp/formNote.jsp 2011-05-26 09:46:08 UTC (rev 52) @@ -8,18 +8,24 @@ <%@page import="org.chorem.vradi.entities.Attachment"%> <%@page import="org.chorem.vradi.entities.FormNote"%> <%@page import="org.chorem.vradi.actions.FormNoteAction"%> + <%@page contentType="text/html" pageEncoding="UTF-8"%> + <%@taglib prefix="s" uri="/struts-tags"%> -<%@taglib prefix="sx" uri="/struts-dojo-tags"%> +<%@taglib prefix="sj" uri="/struts-jquery-tags"%> <% FormNoteAction action = FormNoteAction.getAction(); FormNote formNote = action.getFormNote(); ActionContext.getContext().put("localNoteId", formNote.getWikittyId()); +ActionContext.getContext().put("localFieldSeekingPartner", FormNote.FQ_FIELD_FORMNOTE_SEEKINGPARTNER); ActionContext.getContext().put("localFieldSummary", FormNote.FQ_FIELD_FORMNOTE_SUMMARY); ActionContext.getContext().put("localFieldContent", FormNote.FQ_FIELD_FORMNOTE_CONTENT); ActionContext.getContext().put("localNote", formNote); +ActionContext.getContext().put("localSeekingPartner", formNote.getSeekingPartner()); +ActionContext.getContext().put("localSummary", formNote.getSummary()); +ActionContext.getContext().put("localContent", formNote.getContent()); %> <!DOCTYPE html> @@ -27,7 +33,8 @@ <head> <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"> <title><s:text name="vradi.formNote.title" /></title> - <sx:head /> + <s:head/> + <sj:head jquerytheme="sunny"/> </head> <body> <h1><s:text name="vradi.formNote.title" /></h1> @@ -46,37 +53,55 @@ <div> <s:select size="5" list="partners" listKey="wikittyId" listValue="login"/> <s:a action="seekPartners/%{localNoteId}"><s:text name="vradi.formNote.seekPartners" /></s:a> - <s:checkbox label="seeking partners" name="formNote.seekingPartners" - onchange="var xhr=new XMLHttpRequest(); xhr.open('GET', 'edit/%{localNoteId}.action?seekingPartners='+this.checked, true);xhr.send(null);"/> + <s:checkbox label="seeking partners" name="formNote.seekingPartners" value="%{localSeekingPartner}" + onchange="var url='/ajax/edit/%{localNoteId}.action?%{localFieldSeekingPartner}='+this.checked; var xhr=new XMLHttpRequest(); xhr.open('GET', url, true);xhr.send(null); alert(url);"/> </div> <div> - <sx:tabbedpanel id="tabContainer"> - <sx:div label="Summary" > - <iframe> + <sj:tabbedpanel id="tabContainerSummary" animate="true" + collapsible="true" useSelectedTabCookie="true"> + <sj:tab id="tabHtmlSummary" target="htmlSummary" label="Summary"/> + <sj:tab id="tabHtmlSummaryEdit" target="htmlSummaryEdit" label="Edit"/> + <div id="htmlSummary"> <%=action.getSummary()%> - </iframe> - </sx:div> - <sx:div label="Edit" > - <s:textarea><%=formNote.getSummary()%></s:textarea> - </sx:div> - </sx:tabbedpanel> - <div> - <s:a action="editText?id=%{localNoteId}&field=%{localFieldSummary}"> - <s:text name="vradi.text.edit"/> - </s:a> - </div> + </div> + <div id="htmlSummaryEdit"> + <s:form id="htmlSummaryEditForm" action="/ajax/rst.action"> + <s:hidden name="id" value="%{localNoteId}"/> + <s:hidden name="field" value="%{localFieldSummary}"/> + <s:textarea name="rst" value="%{localSummary}"/> + </s:form> + <sj:a id="htmlSummaryEditSubmit" formIds="htmlSummaryEditForm" + targets="htmlSummary" indicator="indicator" + button="true" buttonIcon="ui-icon-gear"> + <s:text name="vradi.edit.save"/> + </sj:a> + <img id="indicator" src="images/indicator.gif" alt="Loading..." style="display:none"/> + </div> + </sj:tabbedpanel> </div> <div> - <iframe> - <%=action.getContent()%> - </iframe> - <div> - <s:a action="editText?id=%{localNoteId}&field=%{localFieldContent}"> - <s:text name="vradi.text.edit"/> - </s:a> - </div> + <sj:tabbedpanel id="tabContainerContent" animate="true" + collapsible="true" useSelectedTabCookie="true"> + <sj:tab id="tabHtmlContent" target="htmlContent" label="Summary"/> + <sj:tab id="tabHtmlContentEdit" target="htmlContentEdit" label="Edit"/> + <div id="htmlContent" > + <%=action.getContent()%> + </div> + <div id="htmlContentEdit" > + <s:form id="htmlContentEditForm" action="/ajax/edit.action"> + <s:hidden name="id" value="%{localNoteId}"/> + <s:hidden name="field" value="%{localFieldSummary}"/> + <s:textarea name="content" value="%{localContent}"/> + </s:form> + <sj:a id="htmlContentEditSubmit" formIds="htmlContentEditForm" + targets="htmlContent" indicator="indicator" + button="true" buttonIcon="ui-icon-gear"> + <s:text name="vradi.edit.save"/> + </sj:a> + </div> + </sj:tabbedpanel> </div> <div>

1 0

r51 - in trunk/vradi-web/src/main: resources/i18n webapp/WEB-INF/jsp
by sletellier＠users.chorem.org 25 May '11

25 May '11

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 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 =================================================================== --- trunk/vradi-web/src/main/resources/i18n/vradi-web_en_GB.properties 2011-05-25 13:54:55 UTC (rev 50) +++ trunk/vradi-web/src/main/resources/i18n/vradi-web_en_GB.properties 2011-05-25 16:58:41 UTC (rev 51) @@ -26,3 +26,4 @@ vradi.search.title=Search vradi.form.object=Object vradi.form.creationDate=Creation date +vradi.search.formNoteEdit=Notes edition \ 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-05-25 13:54:55 UTC (rev 50) +++ trunk/vradi-web/src/main/resources/i18n/vradi-web_fr_FR.properties 2011-05-25 16:58:41 UTC (rev 51) @@ -25,5 +25,6 @@ vradi.register.pwdDontMatch=Les mots de passe sont différents vradi.register.submit=S'enregistrer vradi.register.title=S'enregistrer +vradi.search.formNoteEdit=Edition des notes vradi.search.submit=Rechercher vradi.search.title=Recherche Modified: trunk/vradi-web/src/main/webapp/WEB-INF/jsp/search.jsp =================================================================== --- trunk/vradi-web/src/main/webapp/WEB-INF/jsp/search.jsp 2011-05-25 13:54:55 UTC (rev 50) +++ trunk/vradi-web/src/main/webapp/WEB-INF/jsp/search.jsp 2011-05-25 16:58:41 UTC (rev 51) @@ -1,11 +1,12 @@ <%@page import="org.chorem.vradi.entities.Infogene"%> +<%@page import="org.chorem.vradi.decorators.EscapeScriptColomnDecorator" %> +<%@page import="org.chorem.vradi.entities.Form" %> +<%@page import="org.chorem.vradi.decorators.DateFormatColumnDecorator" %> <%@page contentType="text/html;charset=UTF-8" pageEncoding="UTF-8"%> <%@taglib prefix="s" uri="/struts-tags"%> <%@taglib prefix="displaytag" uri="http://displaytag.sf.net"%> -<script type="text/javascript" src="/js/jquery-1.6.1.min.js"></script> -<html xmlns:s="http://java.sun.com/xml/ns/j2ee/web-jsptaglibrary_2_0.xsd" - xmlns:jsp="http://java.sun.com/JSP/Page"> +<html> <head> <s:url var="css" value="/css/search.css" /> <link href="${css}" rel="stylesheet" type="text/css" /> @@ -26,13 +27,18 @@ property="<%=Infogene.FIELD_INFOGENE_CREATIONDATE%>" sortable="true" sortProperty="<%=Infogene.FQ_FIELD_INFOGENE_CREATIONDATE%>" - decorator="org.chorem.vradi.decorators.DateFormatColumnDecorator"/> + decorator="<%=DateFormatColumnDecorator.class.getName()%>"/> <displaytag:column titleKey="vradi.form.object" property="<%=Infogene.FIELD_INFOGENE_OBJET%>" sortable="true" sortProperty="<%=Infogene.FQ_FIELD_INFOGENE_OBJET%>" - decorator="org.chorem.vradi.decorators.EscapeScriptColomnDecorator"/> + decorator="<%=EscapeScriptColomnDecorator.class.getName()%>"/> + + <displaytag:column titleKey="common.action" class="action"> + <s:set name="formNoteListURl"><%="formNoteList/" + ((Form)f).getWikittyId()%></s:set> + <s:a action="%{formNoteListURl}"><s:text name="vradi.search.formNoteEdit"/></s:a> + </displaytag:column> </displaytag:table> </body> </html> \ No newline at end of file

1 0

r50 - in trunk/vradi-web/src: main/i18n main/java/org/chorem/vradi main/java/org/chorem/vradi/actions main/java/org/chorem/vradi/decorators main/resources main/resources/i18n main/webapp main/webapp/WEB-INF/jsp main/webapp/css main/webapp/img test/java test/java/org test/java/org/chorem test/java/org/chorem/vradi
by sletellier＠users.chorem.org 25 May '11

25 May '11

Author: sletellier Date: 2011-05-25 15:54:55 +0200 (Wed, 25 May 2011) New Revision: 50 Url: http://chorem.org/repositories/revision/vradi/50 Log: - Add table css - Add image for render sort - Fix pagination - Add escape scipt balise decorator -> add unit test - Fix i18n Added: trunk/vradi-web/src/main/java/org/chorem/vradi/VradiWebHelper.java trunk/vradi-web/src/main/java/org/chorem/vradi/decorators/ trunk/vradi-web/src/main/java/org/chorem/vradi/decorators/DateFormatColumnDecorator.java trunk/vradi-web/src/main/java/org/chorem/vradi/decorators/EscapeScriptColomnDecorator.java trunk/vradi-web/src/main/resources/displaytag.properties trunk/vradi-web/src/main/webapp/css/ trunk/vradi-web/src/main/webapp/css/search.css trunk/vradi-web/src/main/webapp/img/ trunk/vradi-web/src/main/webapp/img/arrow_down.png trunk/vradi-web/src/main/webapp/img/arrow_off.png trunk/vradi-web/src/main/webapp/img/arrow_up.png trunk/vradi-web/src/test/java/org/ trunk/vradi-web/src/test/java/org/chorem/ trunk/vradi-web/src/test/java/org/chorem/vradi/ trunk/vradi-web/src/test/java/org/chorem/vradi/VradiWebHelperTest.java Modified: trunk/vradi-web/src/main/i18n/jsp.rules trunk/vradi-web/src/main/java/org/chorem/vradi/FormPaginatedList.java trunk/vradi-web/src/main/java/org/chorem/vradi/actions/FormNoteAction.java trunk/vradi-web/src/main/java/org/chorem/vradi/actions/SearchAction.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/webapp/WEB-INF/jsp/search.jsp Modified: trunk/vradi-web/src/main/i18n/jsp.rules =================================================================== --- trunk/vradi-web/src/main/i18n/jsp.rules 2011-05-25 13:51:42 UTC (rev 49) +++ trunk/vradi-web/src/main/i18n/jsp.rules 2011-05-25 13:54:55 UTC (rev 50) @@ -11,3 +11,6 @@ //s:select/@key //sx:datetimepicker/@key + +//displaytag:column/@title +//displaytag:column/@titleKey Modified: trunk/vradi-web/src/main/java/org/chorem/vradi/FormPaginatedList.java =================================================================== --- trunk/vradi-web/src/main/java/org/chorem/vradi/FormPaginatedList.java 2011-05-25 13:51:42 UTC (rev 49) +++ trunk/vradi-web/src/main/java/org/chorem/vradi/FormPaginatedList.java 2011-05-25 13:54:55 UTC (rev 50) @@ -1,11 +1,15 @@ package org.chorem.vradi; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; import org.chorem.vradi.beans.FormPagedResult; import org.chorem.vradi.entities.Form; +import org.chorem.vradi.entities.Infogene; import org.displaytag.pagination.PaginatedList; import org.displaytag.properties.SortOrderEnum; import org.nuiton.wikitty.WikittyProxy; +import javax.servlet.http.HttpServletRequest; import java.util.List; /** @@ -13,14 +17,35 @@ */ public class FormPaginatedList implements PaginatedList { + protected static final Log log = LogFactory.getLog(FormPaginatedList.class); + + public static final int NB_FORMS_TO_SHOW = 100; + public static final String DISPLAY_URL_PAGE = "page"; + public static final String DISPLAY_URL_SORT = "sort"; + public static final String DISPLAY_URL_DIR = "dir"; + protected FormPagedResult result; protected WikittyProxy proxy; - public FormPaginatedList(WikittyProxy proxy, FormPagedResult result) { - this.result = result; + public FormPaginatedList(WikittyProxy proxy) { this.proxy = proxy; + result = new FormPagedResult(); + result.setNbFormsToShow(NB_FORMS_TO_SHOW); + result.setPageToShow(1); + + // Sort by default by fate descending + result.setAscending(false); + result.setFieldToSort(Infogene.FIELD_INFOGENE_CREATIONDATE); } + public FormPagedResult getResult() { + return result; + } + + public void setResult(FormPagedResult result) { + this.result = result; + } + @Override public List<Form> getList() { List<String> formsIdsToShow = result.getFormsIdsToShow(); @@ -45,16 +70,64 @@ @Override public String getSortCriterion() { - return null; + return result.getFieldToSort(); } @Override public SortOrderEnum getSortDirection() { - return null; + if (result.isAscending()) { + return SortOrderEnum.ASCENDING; + } else { + return SortOrderEnum.DESCENDING; + } } @Override public String getSearchId() { + + // Not used return null; } + + /** + * Recupere les parametres depuis une requete de servlet. + * + * @param request la requete utilisee pour recuperee les valeur du POJO + * @return l'instance + */ + public FormPaginatedList fromRequest(HttpServletRequest request) { + + // Number of forms by pages + String page = request.getParameter(DISPLAY_URL_PAGE); + if (page != null && !page.trim().isEmpty()) { + Integer pageNumber = Integer.valueOf(page); + if (log.isDebugEnabled()) { + log.debug("change pageNumber : " + pageNumber); + } + result.setPageToShow(pageNumber); + } + + // Search field criteria + String criterion = request.getParameter(DISPLAY_URL_SORT); + if (criterion != null && !criterion.trim().isEmpty()) { + if (log.isDebugEnabled()) { + log.debug("change sortCriterion : " + criterion); + } + result.setFieldToSort(criterion); + } + + // attention, on supose ici qu'on a defini les variables suivantes dans displaytag.properties : + // pagination.sort.asc.value=ascending + // pagination.sort.desc.value=descending + String direction = request.getParameter(DISPLAY_URL_DIR); + if (direction != null && !direction.trim().isEmpty()) { + SortOrderEnum orderEnum = SortOrderEnum.fromName(direction); + if (log.isDebugEnabled()) { + log.debug("change sortDirection : " + orderEnum); + } + boolean ascending = orderEnum.equals(SortOrderEnum.ASCENDING); + result.setAscending(ascending); + } + return this; + } } Added: trunk/vradi-web/src/main/java/org/chorem/vradi/VradiWebHelper.java =================================================================== --- trunk/vradi-web/src/main/java/org/chorem/vradi/VradiWebHelper.java (rev 0) +++ trunk/vradi-web/src/main/java/org/chorem/vradi/VradiWebHelper.java 2011-05-25 13:54:55 UTC (rev 50) @@ -0,0 +1,15 @@ +package org.chorem.vradi; + +/** + * Utilities class + * + * @author sletellier + */ +public class VradiWebHelper { + + public static String escapeSciptBalises(String txt) { + + // (?s) activ dotall (http://download.oracle.com/javase/6/docs/api/java/util/regex/Pattern.html#D…) + return txt.replaceAll("(?s)<script>.*</script>", ""); + } +} Modified: trunk/vradi-web/src/main/java/org/chorem/vradi/actions/FormNoteAction.java =================================================================== --- trunk/vradi-web/src/main/java/org/chorem/vradi/actions/FormNoteAction.java 2011-05-25 13:51:42 UTC (rev 49) +++ trunk/vradi-web/src/main/java/org/chorem/vradi/actions/FormNoteAction.java 2011-05-25 13:54:55 UTC (rev 50) @@ -111,8 +111,8 @@ } partners = proxy.restore(VradiUser.class, formNote.getPartners()); - - // TODO evolution JRST: permettre l'entre String/StringBuffer/Reader, et la sortie String/StringBuffer/Writer pour generate + + // Render JRST in HTML try { summary = JRST.generate(JRST.TYPE_HTML, formNote.getSummary()); } catch(Exception eee) { Modified: trunk/vradi-web/src/main/java/org/chorem/vradi/actions/SearchAction.java =================================================================== --- trunk/vradi-web/src/main/java/org/chorem/vradi/actions/SearchAction.java 2011-05-25 13:51:42 UTC (rev 49) +++ trunk/vradi-web/src/main/java/org/chorem/vradi/actions/SearchAction.java 2011-05-25 13:54:55 UTC (rev 50) @@ -17,11 +17,9 @@ public class SearchAction extends VradiBaseAction implements ServletRequestAware { private static final long serialVersionUID = -3735250067223062719L; + public static final String REQUEST_ATTRIBUTE_FORMS = "forms"; - public static final int NB_FORMS_TO_SHOW = 100; - protected String query; - protected FormPagedResult result; protected HttpServletRequest request; public String getQuery() { @@ -42,23 +40,23 @@ */ public String execute() { - if (result == null) { - result = new FormPagedResult(); - result.setNbFormsToShow(NB_FORMS_TO_SHOW); - } + FormPaginatedList paginatedList = new FormPaginatedList(getProxy()); + paginatedList.fromRequest(request); + QueryParameters queryParameters = new QueryParameters(query); try { - result = getDataService().findForms(queryParameters, result); - log.info(result.getTotalFoundFormNb() + " forms found"); + FormPagedResult result = paginatedList.getResult(); + FormPagedResult forms = getDataService().findForms(queryParameters, result); + paginatedList.setResult(forms); } catch (VradiException eee) { log.error("Failed to execute query", eee); } catch (UnsupportedQueryException eee) { log.error("Unsuported query", eee); } - request.setAttribute("forms", new FormPaginatedList(getProxy(), result)); + request.setAttribute(REQUEST_ATTRIBUTE_FORMS, paginatedList); return SUCCESS; } Added: trunk/vradi-web/src/main/java/org/chorem/vradi/decorators/DateFormatColumnDecorator.java =================================================================== --- trunk/vradi-web/src/main/java/org/chorem/vradi/decorators/DateFormatColumnDecorator.java (rev 0) +++ trunk/vradi-web/src/main/java/org/chorem/vradi/decorators/DateFormatColumnDecorator.java 2011-05-25 13:54:55 UTC (rev 50) @@ -0,0 +1,27 @@ +package org.chorem.vradi.decorators; + +import org.displaytag.decorator.DisplaytagColumnDecorator; +import org.displaytag.exception.DecoratorException; +import org.displaytag.properties.MediaTypeEnum; +import org.nuiton.util.DateUtil; + +import javax.servlet.jsp.PageContext; +import java.util.Date; + +/** + * Decorator used to display tooltip on form lines + * + * @author sletellier + */ +public class DateFormatColumnDecorator implements DisplaytagColumnDecorator { + + @Override + public Object decorate(Object columnValue, PageContext pageContext, MediaTypeEnum media) throws DecoratorException { + + if (columnValue == null) { + return null; + } + String txt = DateUtil.formatDate((Date)columnValue, "dd-MM-yyyy"); + return txt; + } +} Added: trunk/vradi-web/src/main/java/org/chorem/vradi/decorators/EscapeScriptColomnDecorator.java =================================================================== --- trunk/vradi-web/src/main/java/org/chorem/vradi/decorators/EscapeScriptColomnDecorator.java (rev 0) +++ trunk/vradi-web/src/main/java/org/chorem/vradi/decorators/EscapeScriptColomnDecorator.java 2011-05-25 13:54:55 UTC (rev 50) @@ -0,0 +1,28 @@ +package org.chorem.vradi.decorators; + +import org.chorem.vradi.VradiWebHelper; +import org.displaytag.decorator.DisplaytagColumnDecorator; +import org.displaytag.exception.DecoratorException; +import org.displaytag.properties.MediaTypeEnum; + +import javax.servlet.jsp.PageContext; + +/** + * This decorator is used to remove all scipts balises found in content of columns (to prevent attacks) + * + * @author sletellier + */ +public class EscapeScriptColomnDecorator implements DisplaytagColumnDecorator { + + @Override + public Object decorate(Object columnValue, PageContext pageContext, MediaTypeEnum media) throws DecoratorException { + + if (columnValue == null) { + return null; + } + String txt = columnValue.toString(); + txt = VradiWebHelper.escapeSciptBalises(txt); + + return txt; + } +} Added: trunk/vradi-web/src/main/resources/displaytag.properties =================================================================== --- trunk/vradi-web/src/main/resources/displaytag.properties (rev 0) +++ trunk/vradi-web/src/main/resources/displaytag.properties 2011-05-25 13:54:55 UTC (rev 50) @@ -0,0 +1,20 @@ +basic.empty.showtable=true +basic.msg.empty_list=Vide +basic.msg.empty_list_row=<tr class="empty"><td colspan="{0}">Vide</td></tr></tr> + +sort.amount=list + +paging.banner.placement=bottom +paging.banner.item_name=\u00e9l\u00e9ment +paging.banner.items_name=\u00e9l\u00e9ments +paging.banner.no_items_found=<span class="pagebanner">Aucun {0} trouv\u00e9.</span> +paging.banner.one_item_found=<span class="pagebanner">Un seul {0} trouv\u00e9.</span> +paging.banner.all_items_found=<span class="pagebanner">{0} {1} trouv\u00e9s, tout afficher {2}.</span> +paging.banner.some_items_found=<span class="pagebanner">{0} {1} trouv\u00e9s, affich\u00e9 de {2} \u00e0 {3}.</span> +paging.banner.full=<span class="pagelinks">[<a href="{1}">Premier</a>/<a href="{2}">Pr\u00e9c\u00e9dent</a>]{0} [<a href="{3}">Suivant</a>/<a href="{4}">Dernier</a>]</span> +paging.banner.first=<span class="pagelinks">[Permier/Pr\u00e9c\u00e9dent] {0} [<a href="{3}">Suivant</a>/<a href="{4}">Dernier</a>]</span> +paging.banner.last=<span class="pagelinks">[<a href="{1}">Premier</a>/<a href="{2}">Pr\u00e9c\u00e9dent</a>]{0} [Suivant/Dernier]</span> +paging.banner.page.link=<a href="{1}" title="Aller \u00e0 {0}">{0}</a> + +pagination.sort.asc.value=ascending +pagination.sort.desc.value=descending 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-05-25 13:51:42 UTC (rev 49) +++ trunk/vradi-web/src/main/resources/i18n/vradi-web_en_GB.properties 2011-05-25 13:54:55 UTC (rev 50) @@ -24,3 +24,5 @@ vradi.register.title=Login vradi.search.submit=Search vradi.search.title=Search +vradi.form.object=Object +vradi.form.creationDate=Creation date 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-05-25 13:51:42 UTC (rev 49) +++ trunk/vradi-web/src/main/resources/i18n/vradi-web_fr_FR.properties 2011-05-25 13:54:55 UTC (rev 50) @@ -1,4 +1,4 @@ -vradi.authentification.error= +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 vradi.config.last.version.description=Dernière version de Vradi web lancée @@ -9,6 +9,8 @@ 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.creationDate=Date de création +vradi.form.object=Objet vradi.login.email=Email vradi.login.password=Mot de passe vradi.login.repeatPassword=Confiramtion Modified: trunk/vradi-web/src/main/webapp/WEB-INF/jsp/search.jsp =================================================================== --- trunk/vradi-web/src/main/webapp/WEB-INF/jsp/search.jsp 2011-05-25 13:51:42 UTC (rev 49) +++ trunk/vradi-web/src/main/webapp/WEB-INF/jsp/search.jsp 2011-05-25 13:54:55 UTC (rev 50) @@ -1,21 +1,38 @@ -<%@ page contentType="text/html;charset=UTF-8" pageEncoding="UTF-8"%> +<%@page import="org.chorem.vradi.entities.Infogene"%> +<%@page contentType="text/html;charset=UTF-8" pageEncoding="UTF-8"%> <%@taglib prefix="s" uri="/struts-tags"%> <%@taglib prefix="displaytag" uri="http://displaytag.sf.net"%> +<script type="text/javascript" src="/js/jquery-1.6.1.min.js"></script> + <html xmlns:s="http://java.sun.com/xml/ns/j2ee/web-jsptaglibrary_2_0.xsd" xmlns:jsp="http://java.sun.com/JSP/Page"> <head> + <s:url var="css" value="/css/search.css" /> + <link href="${css}" rel="stylesheet" type="text/css" /> <title><s:text name="vradi.search.title" /></title> <s:head /> </head> <body> <s:form id="searchForm" action="search" method="post"> <s:textarea id="searchArea" name="query"/> - <s:submit key="vradi.search.submit" name="submit" /> + <s:submit key="vradi.search.submit" name="submit"/> </s:form> - <displaytag:table name="forms" id="f" requestURI="search.action"> - <displaytag:column titleKey="vradi.form.title" property="creationDate"/> - <displaytag:column titleKey="vradi.form.title" property="objet"/> - <displaytag:column titleKey="vradi.form.title" property="sourceURL"/> + <displaytag:table name="forms" + sort="list" + id="f" + requestURI="search.action"> + + <displaytag:column titleKey="vradi.form.creationDate" + property="<%=Infogene.FIELD_INFOGENE_CREATIONDATE%>" + sortable="true" + sortProperty="<%=Infogene.FQ_FIELD_INFOGENE_CREATIONDATE%>" + decorator="org.chorem.vradi.decorators.DateFormatColumnDecorator"/> + + <displaytag:column titleKey="vradi.form.object" + property="<%=Infogene.FIELD_INFOGENE_OBJET%>" + sortable="true" + sortProperty="<%=Infogene.FQ_FIELD_INFOGENE_OBJET%>" + decorator="org.chorem.vradi.decorators.EscapeScriptColomnDecorator"/> </displaytag:table> </body> </html> \ No newline at end of file Added: trunk/vradi-web/src/main/webapp/css/search.css =================================================================== --- trunk/vradi-web/src/main/webapp/css/search.css (rev 0) +++ trunk/vradi-web/src/main/webapp/css/search.css 2011-05-25 13:54:55 UTC (rev 50) @@ -0,0 +1,42 @@ + +/* Tableau */ +table {border-collapse:collapse; width: 100%;} +.subTable th {font-weight: normal;} + +td { + border: 1px solid black; + padding:5px;} +td.action {text-align: right; white-space:nowrap;} +th { + background-color: #eee; + border: 1px solid black; + padding: 4px; +} + +th a:hover {color: black;} +th a,th a:visited { + text-decoration: none; + font-weight:bold; + color: black; + background-repeat: no-repeat; +} + +/* Tri sur une table */ +th.sorted a,th.sortable a {background-position: right; display: block;} +th.sortable a {background-image: url(../img/arrow_off.png);} +th.order1 a {background-image: url(../img/arrow_down.png);} +th.order2 a {background-image: url(../img/arrow_up.png);} +tr.odd:hover, tr.even:hover { background-color:#deecf1; cursor: pointer;} + +/* Pagination sur une table */ +span.pagebanner, span.pagelinks { + background-color: #eee; + border: 1px solid black; + padding: 2px; + display: block; + text-align: center; +} + +span.pagebanner{margin-top: 10px; border-bottom: none;} +span.pagelinks {border-top: none; margin-bottom: 10px;} +span.pagelinks a, span.pagelinks a:visited{color:black;} Added: trunk/vradi-web/src/main/webapp/img/arrow_down.png =================================================================== (Binary files differ) Property changes on: trunk/vradi-web/src/main/webapp/img/arrow_down.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/vradi-web/src/main/webapp/img/arrow_off.png =================================================================== (Binary files differ) Property changes on: trunk/vradi-web/src/main/webapp/img/arrow_off.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/vradi-web/src/main/webapp/img/arrow_up.png =================================================================== (Binary files differ) Property changes on: trunk/vradi-web/src/main/webapp/img/arrow_up.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/vradi-web/src/test/java/org/chorem/vradi/VradiWebHelperTest.java =================================================================== --- trunk/vradi-web/src/test/java/org/chorem/vradi/VradiWebHelperTest.java (rev 0) +++ trunk/vradi-web/src/test/java/org/chorem/vradi/VradiWebHelperTest.java 2011-05-25 13:54:55 UTC (rev 50) @@ -0,0 +1,72 @@ +package org.chorem.vradi; + +import junit.framework.Assert; +import org.junit.Test; + +/** + * @author sletellier + */ +public class VradiWebHelperTest { + + @Test + public void testEscapeSciptBalises() { + String content = "aaa <p> ppp <br> <script>toRemove</script> </p>"; + + String result = VradiWebHelper.escapeSciptBalises(content); + Assert.assertNotSame(content, result); + Assert.assertFalse(result.contains("toRemove")); + } + + @Test + public void testEscapeSciptBalisesMultiLine() { + String content = "\n" + + "<script>\n" + + " function openPublicAliasForm(bookmarkId) {\n" + + " $(\"#publicAliasFormBookmarkId\")[0].value = bookmarkId;\n" + + " $(\"#setPublicAliasPopup\").dialog(\"open\");\n" + + " return false;\n" + + " }\n" + + " \n" + + " $(function() {\n" + + " $( \"#setPublicAliasPopup\" ).dialog({\n" + + " autoOpen: false,\n" + + " width: 300,\n" + + " modal: true,\n" + + "// buttons: {\n" + + "// \"Validate\": function() {\n" + + "// $(\"#setPublicAliasForm\").submit();\n" + + "// $( this ).dialog( \"close\" );\n" + + "// },\n" + + "// Cancel: function() {\n" + + "// $( this ).dialog( \"close\" );\n" + + "// }\n" + + "// },\n" + + " close: function() {\n" + + " //allFields.val( \"\" ).removeClass( \"ui-state-error\" );\n" + + " }\n" + + " });\n" + + " });\n" + + " function submitPublicAlias() {\n" + + " $(\"#setPublicAliasForm\").submit();\n" + + " closePopupAddUrl();\n" + + " }\n" + + "\n" + + " function closePopupPublicAlias() {\n" + + " $( \"#setPublicAliasPopup\" ).dialog( \"close\" )\n" + + " }\n" + + "</script>\n" + + "\n" + + "<div xmlns:s=\"http://java.sun.com/xml/ns/j2ee/web-jsptaglibrary_2_0.xsd\"\n" + + " id=\"setPublicAliasPopup\" title=\"Entrer un alias public\">\n" + + " <form id=\"setPublicAliasForm\" name=\"setPublicAliasForm\" action=\"createAlias\" method=\"post\">\n" + + "<table class=\"wwFormTable\"><tr>\n" + + " <td class=\"tdLabel\"><label for=\"setPublicAliasForm_alias\" class=\"label\">ALIAS:</label></td>\n" + + " <td\n" + + "><input type=\"text\" name=\"alias\" value=\"\" id=\"setPublicAliasForm_alias\" class=\"class java.util.HashMap\"/></td>\n" + + "</tr>\n" + + "<input type=\"hidden\" name=\"bookmarkId\" value=\"\" id=\"publicAliasFormBookmarkId\"/></table></form>"; + String result = VradiWebHelper.escapeSciptBalises(content); + Assert.assertNotSame(content, result); + Assert.assertFalse(result.contains("<script>")); + } +}

1 0

r49 - in trunk: vradi-services/src/main/java/org/chorem/vradi/beans vradi-services/src/main/java/org/chorem/vradi/services/managers vradi-swing/src/main/java/org/chorem/vradi/ui/email/helpers
by sletellier＠users.chorem.org 25 May '11

25 May '11

Author: sletellier Date: 2011-05-25 15:51:42 +0200 (Wed, 25 May 2011) New Revision: 49 Url: http://chorem.org/repositories/revision/vradi/49 Log: [Search] Return same but filled FormPagedResult passed on param Modified: trunk/vradi-services/src/main/java/org/chorem/vradi/beans/FormPagedResult.java trunk/vradi-services/src/main/java/org/chorem/vradi/services/managers/SearchManager.java trunk/vradi-swing/src/main/java/org/chorem/vradi/ui/email/helpers/SendingViewManager.java Modified: trunk/vradi-services/src/main/java/org/chorem/vradi/beans/FormPagedResult.java =================================================================== --- trunk/vradi-services/src/main/java/org/chorem/vradi/beans/FormPagedResult.java 2011-05-24 23:38:12 UTC (rev 48) +++ trunk/vradi-services/src/main/java/org/chorem/vradi/beans/FormPagedResult.java 2011-05-25 13:51:42 UTC (rev 49) @@ -92,6 +92,10 @@ this.nbFormsToShow = nbFormsToShow; } + public void setFormsToShow(List<Form> formsToShow) { + setFormsIdsToShow(extractIds(formsToShow)); + } + protected List<String> extractIds(List<Form> formsToShow) { List<String> formsIds = new ArrayList<String>(); if (formsToShow != null) { @@ -108,7 +112,7 @@ return formsIdsToShow; } - public void setFormsToShow(List<String> formsIdsToShow) { + public void setFormsIdsToShow(List<String> formsIdsToShow) { List<String> oldValue = this.formsIdsToShow; this.formsIdsToShow = formsIdsToShow; propertyChange.firePropertyChange(FORMS_TO_SHOW_PROPERTY, oldValue, formsIdsToShow); Modified: trunk/vradi-services/src/main/java/org/chorem/vradi/services/managers/SearchManager.java =================================================================== --- trunk/vradi-services/src/main/java/org/chorem/vradi/services/managers/SearchManager.java 2011-05-24 23:38:12 UTC (rev 48) +++ trunk/vradi-services/src/main/java/org/chorem/vradi/services/managers/SearchManager.java 2011-05-25 13:51:42 UTC (rev 49) @@ -26,7 +26,6 @@ import org.apache.commons.collections.CollectionUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.chorem.vradi.VradiServiceAction; import org.chorem.vradi.beans.FormPagedResult; import org.chorem.vradi.beans.QueryBean; import org.chorem.vradi.beans.QueryParameters; @@ -178,11 +177,10 @@ } List<Form> result = new ArrayList<Form>(queryResult.getAll()); - FormPagedResult formPageResult = new FormPagedResult(result, - queryResult.getNumFound(), formPagedResult.getPageToShow(), - formPagedResult.getNbFormsToShow()); + formPagedResult.setFormsToShow(result); + formPagedResult.setTotalFoundFormNb(queryResult.getNumFound()); - return formPageResult; + return formPagedResult; } public FormPagedResult findForms(QueryParameters queryParameters, FormPagedResult formPagedResult) Modified: trunk/vradi-swing/src/main/java/org/chorem/vradi/ui/email/helpers/SendingViewManager.java =================================================================== --- trunk/vradi-swing/src/main/java/org/chorem/vradi/ui/email/helpers/SendingViewManager.java 2011-05-24 23:38:12 UTC (rev 48) +++ trunk/vradi-swing/src/main/java/org/chorem/vradi/ui/email/helpers/SendingViewManager.java 2011-05-25 13:51:42 UTC (rev 49) @@ -172,7 +172,7 @@ formsIdsToDisplay.addAll(deletedForms); } if (!formsIdsToDisplay.isEmpty()) { - formPage.setFormsToShow(new ArrayList<String>(formsIdsToDisplay)); + formPage.setFormsIdsToShow(new ArrayList<String>(formsIdsToDisplay)); } emailFormsHighlighter.setFormsAdded(addedForms);

1 0

r48 - trunk/vradi-web/src/main/webapp
by bpoussin＠users.chorem.org 24 May '11

24 May '11

Author: bpoussin Date: 2011-05-25 01:38:12 +0200 (Wed, 25 May 2011) New Revision: 48 Url: http://chorem.org/repositories/revision/vradi/48 Log: remove index.html not used anymore Removed: trunk/vradi-web/src/main/webapp/index.html Deleted: trunk/vradi-web/src/main/webapp/index.html =================================================================== --- trunk/vradi-web/src/main/webapp/index.html 2011-05-24 23:37:42 UTC (rev 47) +++ trunk/vradi-web/src/main/webapp/index.html 2011-05-24 23:38:12 UTC (rev 48) @@ -1,11 +0,0 @@ -<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> -<html xmlns="http://www.w3.org/1999/xhtml"> - <head> - <meta http-equiv="refresh" content="0;URL=search.action"/> - <title>Vradi web</title> - </head> - - <body onload=""> - - </body> -</html> \ No newline at end of file

1 0

r47 - trunk/vradi-web/src/main/webapp/WEB-INF/jsp
by bpoussin＠users.chorem.org 24 May '11

24 May '11

Author: bpoussin Date: 2011-05-25 01:37:42 +0200 (Wed, 25 May 2011) New Revision: 47 Url: http://chorem.org/repositories/revision/vradi/47 Log: fix bug in url construction Modified: trunk/vradi-web/src/main/webapp/WEB-INF/jsp/formNoteList.jsp Modified: trunk/vradi-web/src/main/webapp/WEB-INF/jsp/formNoteList.jsp =================================================================== --- trunk/vradi-web/src/main/webapp/WEB-INF/jsp/formNoteList.jsp 2011-05-24 23:33:19 UTC (rev 46) +++ trunk/vradi-web/src/main/webapp/WEB-INF/jsp/formNoteList.jsp 2011-05-24 23:37:42 UTC (rev 47) @@ -4,6 +4,7 @@ Author : poussin --%> +<%@page import="com.opensymphony.xwork2.ActionContext"%> <%@page import="org.chorem.vradi.entities.FormNote"%> <%@page import="org.chorem.vradi.actions.FormNoteListAction"%> <%@page contentType="text/html" pageEncoding="UTF-8"%> @@ -23,8 +24,10 @@ <h1><s:text name="vradi.formNoteList.title" /></h1> <ul> - <% for (FormNote note : action.getFormNotes()) { %> - <li><s:a action="formNote/%{note.getWikittyId()}"><%=note.getCreationDate()%> <%=note.getSummary()%></s:a></li> + <% 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/new?formId=%{formId}"><s:text name="vradi.new.formNote"/></s:a></li> </ul>

1 0

r46 - in trunk/vradi-web/src/main: java/org/chorem/vradi/actions java/org/chorem/vradi/interceptors resources webapp/WEB-INF
by bpoussin＠users.chorem.org 24 May '11

24 May '11

Author: bpoussin Date: 2011-05-25 01:33:19 +0200 (Wed, 25 May 2011) New Revision: 46 Url: http://chorem.org/repositories/revision/vradi/46 Log: - / redirect to /search.action - redirect to requested page after login Modified: trunk/vradi-web/src/main/java/org/chorem/vradi/actions/EditAction.java trunk/vradi-web/src/main/java/org/chorem/vradi/actions/LoginAction.java trunk/vradi-web/src/main/java/org/chorem/vradi/interceptors/LoginInterceptor.java trunk/vradi-web/src/main/resources/struts.xml trunk/vradi-web/src/main/webapp/WEB-INF/web.xml Modified: trunk/vradi-web/src/main/java/org/chorem/vradi/actions/EditAction.java =================================================================== --- trunk/vradi-web/src/main/java/org/chorem/vradi/actions/EditAction.java 2011-05-24 00:35:31 UTC (rev 45) +++ trunk/vradi-web/src/main/java/org/chorem/vradi/actions/EditAction.java 2011-05-24 23:33:19 UTC (rev 46) @@ -3,11 +3,13 @@ import com.opensymphony.xwork2.ActionContext; import javax.servlet.ServletRequest; import javax.servlet.http.HttpServletRequest; +import org.apache.commons.lang.StringUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.apache.struts2.interceptor.ServletRequestAware; import org.nuiton.wikitty.WikittyProxy; import org.nuiton.wikitty.entities.Wikitty; +import org.nuiton.wikitty.entities.WikittyExtension; /** * @@ -26,10 +28,20 @@ return (EditAction)ActionContext.getContext().get(CONTEXT_ACTION_KEY); } + /** restraint les modifications possibles sur certaine extension */ + protected String restrictedExtension; protected HttpServletRequest request; protected String id; protected Wikitty wikitty; + public String getRestrictedExtension() { + return restrictedExtension; + } + + public void setRestrictedExtension(String restrictedExtension) { + this.restrictedExtension = restrictedExtension; + } + @Override public void setServletRequest(HttpServletRequest request) { this.request = request; @@ -47,6 +59,21 @@ return wikitty; } + protected boolean isAcceptableExtension(String fqfield) { + boolean result = false; + if (StringUtils.isBlank(restrictedExtension)) { + result = true; + } else { + try { + String extName = WikittyExtension.extractExtensionName(fqfield); + result = restrictedExtension.contains(extName); + } catch(Exception eee) { + log.debug("Not acceptable extension format", eee); + } + } + return result; + } + @Override public String execute() throws Exception { String result = SUCCESS; @@ -57,7 +84,7 @@ for (Object key : request.getParameterMap().keySet()) { String k = String.valueOf(key); log.debug(String.format("Look for field(%s)", k)); - if (wikitty.hasField(k)) { + if (wikitty.hasField(k) && isAcceptableExtension(k)) { Object v = request.getParameter(k); log.debug(String.format("Put value(%s) in field(%s)", v, k)); wikitty.setFqField(k, v); Modified: trunk/vradi-web/src/main/java/org/chorem/vradi/actions/LoginAction.java =================================================================== --- trunk/vradi-web/src/main/java/org/chorem/vradi/actions/LoginAction.java 2011-05-24 00:35:31 UTC (rev 45) +++ trunk/vradi-web/src/main/java/org/chorem/vradi/actions/LoginAction.java 2011-05-24 23:33:19 UTC (rev 46) @@ -17,8 +17,11 @@ private static final long serialVersionUID = 6891064800288772246L; + public static final String REDIRECT_AFTER_LOGIN = "redirectAfterLogin"; + protected String email; protected String password; + protected String redirectTo; public String getEmail() { return email; @@ -36,12 +39,22 @@ this.password = password; } + public String getRedirectTo() { + return redirectTo; + } + /** * Authenticates the user if his email and password are valid */ + @Override public String execute() { String result = INPUT; + // si un utilisateur est deja connecte, on commence par le deloggue + VradiUser user = getVradiSession().getUser(); + if (user != null) { + getVradiSession().invalidate(session); + } try { if (email != null) { email = email.trim(); @@ -49,6 +62,13 @@ if (password != null) { String md5 = StringUtil.encodeMD5(password); getVradiSession().login(email, md5); + redirectTo = (String)session.get(REDIRECT_AFTER_LOGIN); + // on ne laisse pas de trace dans la session + session.remove(REDIRECT_AFTER_LOGIN); + if (redirectTo == null) { + redirectTo = "/"; + } + log.debug(String.format("Login ok, we go to '%s'", redirectTo)); result = SUCCESS; } } @@ -58,4 +78,4 @@ } return result; } -} \ No newline at end of file +} Modified: trunk/vradi-web/src/main/java/org/chorem/vradi/interceptors/LoginInterceptor.java =================================================================== --- trunk/vradi-web/src/main/java/org/chorem/vradi/interceptors/LoginInterceptor.java 2011-05-24 00:35:31 UTC (rev 45) +++ trunk/vradi-web/src/main/java/org/chorem/vradi/interceptors/LoginInterceptor.java 2011-05-24 23:33:19 UTC (rev 46) @@ -1,13 +1,18 @@ package org.chorem.vradi.interceptors; import java.util.Map; +import javax.servlet.http.HttpServletRequest; import org.apache.struts2.ServletActionContext; import com.opensymphony.xwork2.ActionContext; import com.opensymphony.xwork2.ActionInvocation; import com.opensymphony.xwork2.interceptor.AbstractInterceptor; +import org.apache.commons.lang.StringUtils; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; import org.chorem.vradi.VradiSession; +import org.chorem.vradi.actions.LoginAction; import org.chorem.vradi.entities.VradiUser; /** @@ -15,8 +20,12 @@ * where logging is mandatory */ public class LoginInterceptor extends AbstractInterceptor { + private static final long serialVersionUID = -7520186185205372272L; + /** to use log facility, just put in your code: log.info(\"...\"); */ + static private Log log = LogFactory.getLog(VradiSession.class); + protected String loginRedirect; /** @@ -36,6 +45,25 @@ //If the user isn't logged in if (user == null) { + // put in session url where we must go after login + HttpServletRequest request = ServletActionContext.getRequest(); + String action = request.getPathInfo(); + String redirect = null; + // si l'utilisateur n'a pas demande explicitement la page de login + // on essaiera de le rediriger vers la page qu'il a demande apres + // le login + if (!StringUtils.startsWith(action, loginRedirect)) { + StringBuffer url = request.getRequestURL(); + String query = request.getQueryString(); + if (query != null) { + url.append('?'); + url.append(query); + } + redirect = url.toString(); + } + session.put(LoginAction.REDIRECT_AFTER_LOGIN, redirect); + log.debug(String.format("User not loggued redirect to '%s' and '%s'", + loginRedirect, redirect)); ServletActionContext.getResponse().sendRedirect(loginRedirect); } else { result = invocation.invoke(); Modified: trunk/vradi-web/src/main/resources/struts.xml =================================================================== --- trunk/vradi-web/src/main/resources/struts.xml 2011-05-24 00:35:31 UTC (rev 45) +++ trunk/vradi-web/src/main/resources/struts.xml 2011-05-24 23:33:19 UTC (rev 46) @@ -71,15 +71,14 @@ </action> <action name="forgotPassword_*" method="{1}" class="org.chorem.vradi.actions.ForgotPasswordAction"> <result name="input">/WEB-INF/jsp/forgotPassword.jsp</result> - <result type="redirectAction">login_input</result> + <result type="redirectAction">login</result> </action> - <action name="login_*" method="{1}" class="org.chorem.vradi.actions.LoginAction"> + <action name="login" class="org.chorem.vradi.actions.LoginAction"> <result name="input">/WEB-INF/jsp/login.jsp</result> - <result name="login" type="redirectAction">search</result> - <result type="redirectAction">search</result> + <result type="redirect">${redirectTo}</result> </action> <action name="logout" class="org.chorem.vradi.actions.LogoutAction"> - <result type="redirectAction">login_input</result> + <result type="redirectAction">login</result> </action> </package> @@ -109,6 +108,7 @@ +--> <action name="edit/*" class="org.chorem.vradi.actions.EditAction"> <param name="id">{1}</param> + <param name="restrictedExtension">FormNote</param> <result type="wikitty-json"/> </action> </package> Modified: trunk/vradi-web/src/main/webapp/WEB-INF/web.xml =================================================================== --- trunk/vradi-web/src/main/webapp/WEB-INF/web.xml 2011-05-24 00:35:31 UTC (rev 45) +++ trunk/vradi-web/src/main/webapp/WEB-INF/web.xml 2011-05-24 23:33:19 UTC (rev 46) @@ -22,27 +22,19 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #L% --> - -<web-app id="bow" version="2.4" xmlns="http://java.sun.com/xml/ns/j2ee" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd"> - - <display-name>Bow</display-name> - -  - <filter> - <filter-name>struts2</filter-name> - <filter-class>org.apache.struts2.dispatcher.ng.filter.StrutsPrepareAndExecuteFilter</filter-class> - </filter> - - <filter-mapping> - <filter-name>struts2</filter-name> - <url-pattern>/*</url-pattern> - </filter-mapping> - -  - <welcome-file-list> - <welcome-file>index.html</welcome-file> - </welcome-file-list> - +<web-app id="bow" version="2.4" xmlns="http://java.sun.com/xml/ns/j2ee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd"> + <display-name>Bow</display-name> +  + <filter> + <filter-name>struts2</filter-name> + <filter-class>org.apache.struts2.dispatcher.ng.filter.StrutsPrepareAndExecuteFilter</filter-class> + </filter> + <filter-mapping> + <filter-name>struts2</filter-name> + <url-pattern>/*</url-pattern> + </filter-mapping> +  + <welcome-file-list> + <welcome-file>search.action</welcome-file> + </welcome-file-list> </web-app>

1 0

r45 - trunk/vradi-web/src/main/java/org/chorem/vradi/actions
by bpoussin＠users.chorem.org 24 May '11

24 May '11

Author: bpoussin Date: 2011-05-24 02:35:31 +0200 (Tue, 24 May 2011) New Revision: 45 Url: http://chorem.org/repositories/revision/vradi/45 Log: edit work correctly Modified: trunk/vradi-web/src/main/java/org/chorem/vradi/actions/EditAction.java Modified: trunk/vradi-web/src/main/java/org/chorem/vradi/actions/EditAction.java =================================================================== --- trunk/vradi-web/src/main/java/org/chorem/vradi/actions/EditAction.java 2011-05-24 00:15:51 UTC (rev 44) +++ trunk/vradi-web/src/main/java/org/chorem/vradi/actions/EditAction.java 2011-05-24 00:35:31 UTC (rev 45) @@ -1,10 +1,11 @@ package org.chorem.vradi.actions; import com.opensymphony.xwork2.ActionContext; -import java.util.Map; +import javax.servlet.ServletRequest; +import javax.servlet.http.HttpServletRequest; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.apache.struts2.interceptor.RequestAware; +import org.apache.struts2.interceptor.ServletRequestAware; import org.nuiton.wikitty.WikittyProxy; import org.nuiton.wikitty.entities.Wikitty; @@ -16,7 +17,7 @@ * Last update: $Date$ * by : $Author$ */ -public class EditAction extends VradiBaseAction implements RequestAware { +public class EditAction extends VradiBaseAction implements ServletRequestAware { /** to use log facility, just put in your code: log.info(\"...\"); */ static private Log log = LogFactory.getLog(EditAction.class); @@ -25,11 +26,12 @@ return (EditAction)ActionContext.getContext().get(CONTEXT_ACTION_KEY); } - protected Map<String,Object> request; + protected HttpServletRequest request; protected String id; protected Wikitty wikitty; - public void setRequest(Map<String,Object> request) { + @Override + public void setServletRequest(HttpServletRequest request) { this.request = request; } @@ -52,9 +54,11 @@ wikitty = proxy.restore(getId()); if (wikitty != null) { try { - for (String k : request.keySet()) { + for (Object key : request.getParameterMap().keySet()) { + String k = String.valueOf(key); + log.debug(String.format("Look for field(%s)", k)); if (wikitty.hasField(k)) { - Object v = request.get(k); + Object v = request.getParameter(k); log.debug(String.format("Put value(%s) in field(%s)", v, k)); wikitty.setFqField(k, v); }

1 0

r44 - trunk/vradi-entities/src/main/xmi
by bpoussin＠users.chorem.org 24 May '11

24 May '11

Author: bpoussin Date: 2011-05-24 02:15:51 +0200 (Tue, 24 May 2011) New Revision: 44 Url: http://chorem.org/repositories/revision/vradi/44 Log: minor model change for FormNote Modified: trunk/vradi-entities/src/main/xmi/vradi.zargo Modified: trunk/vradi-entities/src/main/xmi/vradi.zargo =================================================================== (Binary files differ)

1 0

r43 - in trunk: . vradi-web vradi-web/src/main/java/org/chorem/vradi/actions vradi-web/src/main/resources vradi-web/src/main/webapp/WEB-INF/jsp
by bpoussin＠users.chorem.org 24 May '11

24 May '11

Author: bpoussin Date: 2011-05-24 02:15:14 +0200 (Tue, 24 May 2011) New Revision: 43 Url: http://chorem.org/repositories/revision/vradi/43 Log: - add edit action to directly modify some wikitty field (not work currently) - add wikitty-json respond in struts.xml to return wikitty objet in json format - begin to add ajax tabbed to view/edit rst text Added: trunk/vradi-web/src/main/java/org/chorem/vradi/actions/EditAction.java Modified: trunk/pom.xml trunk/vradi-web/pom.xml trunk/vradi-web/src/main/java/org/chorem/vradi/actions/FormNoteAction.java trunk/vradi-web/src/main/resources/struts.xml trunk/vradi-web/src/main/webapp/WEB-INF/jsp/formNote.jsp trunk/vradi-web/src/main/webapp/WEB-INF/jsp/formNoteList.jsp Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2011-05-23 07:51:55 UTC (rev 42) +++ trunk/pom.xml 2011-05-24 00:15:14 UTC (rev 43) @@ -421,6 +421,18 @@ </dependency> <dependency> + <groupId>org.apache.struts</groupId> + <artifactId>struts2-dojo-plugin</artifactId> + <version>${struts2Version}</version> + </dependency> + + <dependency> + <groupId>org.apache.struts</groupId> + <artifactId>struts2-json-plugin</artifactId> + <version>${struts2Version}</version> + </dependency> + + <dependency> <groupId>org.apache.struts.xwork</groupId> <artifactId>xwork-core</artifactId> <version>${struts2Version}</version> Modified: trunk/vradi-web/pom.xml =================================================================== --- trunk/vradi-web/pom.xml 2011-05-23 07:51:55 UTC (rev 42) +++ trunk/vradi-web/pom.xml 2011-05-24 00:15:14 UTC (rev 43) @@ -60,6 +60,11 @@ </dependency> <dependency> + <groupId>org.nuiton.jrst</groupId> + <artifactId>jrst</artifactId> + </dependency> + + <dependency> <groupId>org.nuiton.i18n</groupId> <artifactId>nuiton-i18n</artifactId> </dependency> @@ -75,6 +80,24 @@ </dependency> <dependency> + <groupId>org.apache.struts</groupId> + <artifactId>struts2-config-browser-plugin</artifactId> + <scope>runtime</scope> + </dependency> + + <dependency> + <groupId>org.apache.struts</groupId> + <artifactId>struts2-dojo-plugin</artifactId> + <scope>runtime</scope> + </dependency> + + <dependency> + <groupId>org.apache.struts</groupId> + <artifactId>struts2-json-plugin</artifactId> + <scope>runtime</scope> + </dependency> + + <dependency> <groupId>org.apache.struts.xwork</groupId> <artifactId>xwork-core</artifactId> </dependency> @@ -148,11 +171,6 @@ </dependency> <dependency> - <groupId>org.nuiton.jrst</groupId> - <artifactId>jrst</artifactId> - </dependency> - - <dependency> <groupId>org.slf4j</groupId> <artifactId>slf4j-api</artifactId> <scope>runtime</scope> @@ -171,12 +189,6 @@ </dependency> <dependency> - <groupId>org.apache.struts</groupId> - <artifactId>struts2-config-browser-plugin</artifactId> - <scope>runtime</scope> - </dependency> - - <dependency> <groupId>commons-io</groupId> <artifactId>commons-io</artifactId> <scope>compile</scope> Added: trunk/vradi-web/src/main/java/org/chorem/vradi/actions/EditAction.java =================================================================== --- trunk/vradi-web/src/main/java/org/chorem/vradi/actions/EditAction.java (rev 0) +++ trunk/vradi-web/src/main/java/org/chorem/vradi/actions/EditAction.java 2011-05-24 00:15:14 UTC (rev 43) @@ -0,0 +1,71 @@ +package org.chorem.vradi.actions; + +import com.opensymphony.xwork2.ActionContext; +import java.util.Map; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.apache.struts2.interceptor.RequestAware; +import org.nuiton.wikitty.WikittyProxy; +import org.nuiton.wikitty.entities.Wikitty; + +/** + * + * @author poussin + * @version $Revision$ + * + * Last update: $Date$ + * by : $Author$ + */ +public class EditAction extends VradiBaseAction implements RequestAware { + + /** to use log facility, just put in your code: log.info(\"...\"); */ + static private Log log = LogFactory.getLog(EditAction.class); + + static public EditAction getAction() { + return (EditAction)ActionContext.getContext().get(CONTEXT_ACTION_KEY); + } + + protected Map<String,Object> request; + protected String id; + protected Wikitty wikitty; + + public void setRequest(Map<String,Object> request) { + this.request = request; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public Wikitty getWikitty() { + return wikitty; + } + + @Override + public String execute() throws Exception { + String result = SUCCESS; + WikittyProxy proxy = getProxy(); + wikitty = proxy.restore(getId()); + if (wikitty != null) { + try { + for (String k : request.keySet()) { + if (wikitty.hasField(k)) { + Object v = request.get(k); + log.debug(String.format("Put value(%s) in field(%s)", v, k)); + wikitty.setFqField(k, v); + } + } + wikitty = proxy.store(wikitty); + } catch(Exception eee) { + log.error("Can't edit wikitty", eee); + result = ERROR; + } + } + return result; + } + +} Modified: trunk/vradi-web/src/main/java/org/chorem/vradi/actions/FormNoteAction.java =================================================================== --- trunk/vradi-web/src/main/java/org/chorem/vradi/actions/FormNoteAction.java 2011-05-23 07:51:55 UTC (rev 42) +++ trunk/vradi-web/src/main/java/org/chorem/vradi/actions/FormNoteAction.java 2011-05-24 00:15:14 UTC (rev 43) @@ -1,7 +1,9 @@ package org.chorem.vradi.actions; import com.opensymphony.xwork2.ActionContext; +import java.util.Date; import java.util.Set; +import org.apache.commons.lang.StringUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.chorem.vradi.entities.Attachment; @@ -74,10 +76,18 @@ return summary; } + public void setSummary(String summary) { + this.summary = summary; + } + public String getContent() { return content; } + public void setContent(String content) { + this.content = content; + } + public PagedResult<Attachment> getAttachments() { return attachments; } @@ -88,18 +98,34 @@ formNote = proxy.restore(FormNote.class, getFormNoteId()); if (formNote == null) { formNote = new FormNoteImpl(); + formNote.setCreationDate(new Date()); formNote.setForm(getFormId()); formNote.addPartners(proxy.getUser().getWikittyId()); + formNote.setSummary(StringUtils.trimToEmpty(summary)); + formNote.setContent(StringUtils.trimToEmpty(content)); + formNote.setSeekingPartner(false); + formNote.setState("Open"); + formNote.addHistory(String.format("%tF creation", + formNote.getCreationDate())); + proxy.store(formNote); } partners = proxy.restore(VradiUser.class, formNote.getPartners()); // TODO evolution JRST: permettre l'entre String/StringBuffer/Reader, et la sortie String/StringBuffer/Writer pour generate - summary = JRST.generate(JRST.TYPE_HTML, formNote.getSummary()); - content = JRST.generate(JRST.TYPE_HTML, formNote.getContent()); - summary = formNote.getSummary(); - content = formNote.getContent(); - + try { + summary = JRST.generate(JRST.TYPE_HTML, formNote.getSummary()); + } catch(Exception eee) { + log.info("Can't generate HTML from RST", eee); + summary = formNote.getSummary(); + } + try { + content = JRST.generate(JRST.TYPE_HTML, formNote.getContent()); + } catch(Exception eee) { + log.info("Can't generate HTML from RST", eee); + content = formNote.getContent(); + } + Criteria criteria = Search.query() .eq(Attachment.FQ_FIELD_ATTACHMENT_FORMNOTE, getFormNoteId()) .criteria().addSortDescending(Attachment.FQ_FIELD_ATTACHMENT_DATE); Modified: trunk/vradi-web/src/main/resources/struts.xml =================================================================== --- trunk/vradi-web/src/main/resources/struts.xml 2011-05-23 07:51:55 UTC (rev 42) +++ trunk/vradi-web/src/main/resources/struts.xml 2011-05-24 00:15:14 UTC (rev 43) @@ -13,9 +13,20 @@ | - surcharge de parametre de certain intercepteur +--> <package name="publicArea" extends="struts-default"> + <result-types> + <result-type name="json" class="org.apache.struts2.json.JSONResult"/> + <result-type name="wikitty-json" class="org.apache.struts2.json.JSONResult"> + <param name="includeProperties">id,extensionNames\[\d+\],fieldValue\..*\..*</param> + <param name="root">wikitty</param> + </result-type> + </result-types> <interceptors> + <interceptor name="json" class="org.apache.struts2.json.JSONInterceptor"/> <interceptor-stack name="publicAreaStack"> <interceptor-ref name="defaultStack"/> + <interceptor-ref name="json"> + <param name="enableSMD">true</param> + </interceptor-ref> </interceptor-stack> </interceptors> <default-interceptor-ref name="publicAreaStack"/> @@ -43,7 +54,7 @@ <package name="restrictedArea" extends="publicArea"> <interceptors> <interceptor name="login" class="org.chorem.vradi.interceptors.LoginInterceptor"> - <param name="loginRedirect">login.action</param> + <param name="loginRedirect">/login.action</param> </interceptor> <interceptor-stack name="restrictedAreaStack"> <interceptor-ref name="login"/> @@ -92,6 +103,14 @@ <param name="formNoteId">{1}</param> <result>/WEB-INF/jsp/formNote.jsp</result> </action> +  + <action name="edit/*" class="org.chorem.vradi.actions.EditAction"> + <param name="id">{1}</param> + <result type="wikitty-json"/> + </action> </package> </struts> Modified: trunk/vradi-web/src/main/webapp/WEB-INF/jsp/formNote.jsp =================================================================== --- trunk/vradi-web/src/main/webapp/WEB-INF/jsp/formNote.jsp 2011-05-23 07:51:55 UTC (rev 42) +++ trunk/vradi-web/src/main/webapp/WEB-INF/jsp/formNote.jsp 2011-05-24 00:15:14 UTC (rev 43) @@ -4,15 +4,22 @@ Author : poussin --%> +<%@page import="com.opensymphony.xwork2.ActionContext"%> <%@page import="org.chorem.vradi.entities.Attachment"%> <%@page import="org.chorem.vradi.entities.FormNote"%> <%@page import="org.chorem.vradi.actions.FormNoteAction"%> <%@page contentType="text/html" pageEncoding="UTF-8"%> <%@taglib prefix="s" uri="/struts-tags"%> +<%@taglib prefix="sx" uri="/struts-dojo-tags"%> <% FormNoteAction action = FormNoteAction.getAction(); -FormNote note = action.getFormNote(); +FormNote formNote = action.getFormNote(); + +ActionContext.getContext().put("localNoteId", formNote.getWikittyId()); +ActionContext.getContext().put("localFieldSummary", FormNote.FQ_FIELD_FORMNOTE_SUMMARY); +ActionContext.getContext().put("localFieldContent", FormNote.FQ_FIELD_FORMNOTE_CONTENT); +ActionContext.getContext().put("localNote", formNote); %> <!DOCTYPE html> @@ -20,35 +27,56 @@ <head> <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"> <title><s:text name="vradi.formNote.title" /></title> + <sx:head /> </head> <body> <h1><s:text name="vradi.formNote.title" /></h1> <div> - <s:a action="formNoteEdit/<%=note.getWikittyId()%>?state=close"><s:text name="vradi.formNote.close" /></s:a> - <s:a action="delete/<%=note.getWikittyId()%>"><s:text name="vradi.delete" /></s: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> </div> <div> - <% for (String h : note.getHistory()) { %> + <% for (String h : formNote.getHistory()) { %> <div><%=h%></div> <% } %> </div> <div> - <s:select list="partners"/> - <s:a action="seekPartners/<%=note.getWikittyId()%>"><s:text name="vradi.formNote.seekPartners" /></s:a> - <s:checkbox label="seeking partners" fieldValue="note.seekingPartners"/> + <s:select size="5" list="partners" listKey="wikittyId" listValue="login"/> + <s:a action="seekPartners/%{localNoteId}"><s:text name="vradi.formNote.seekPartners" /></s:a> + <s:checkbox label="seeking partners" name="formNote.seekingPartners" + onchange="var xhr=new XMLHttpRequest(); xhr.open('GET', 'edit/%{localNoteId}.action?seekingPartners='+this.checked, true);xhr.send(null);"/> </div> <div> - <%=action.getSummary()%> - <div><s:a action="editText?id=<%=note.getWikittyId()%>&field=<%=FormNote.FQ_FIELD_FORMNOTE_SUMMARY%>" label="vradi.text.edit"/></div> + <sx:tabbedpanel id="tabContainer"> + <sx:div label="Summary" > + <iframe> + <%=action.getSummary()%> + </iframe> + </sx:div> + <sx:div label="Edit" > + <s:textarea><%=formNote.getSummary()%></s:textarea> + </sx:div> + </sx:tabbedpanel> + <div> + <s:a action="editText?id=%{localNoteId}&field=%{localFieldSummary}"> + <s:text name="vradi.text.edit"/> + </s:a> + </div> </div> <div> - <%=action.getContent()%> - <div><s:a action="editText?id=<%=note.getWikittyId()%>&field=<%=FormNote.FQ_FIELD_FORMNOTE_CONTENT%>" label="vradi.text.edit"/></div> + <iframe> + <%=action.getContent()%> + </iframe> + <div> + <s:a action="editText?id=%{localNoteId}&field=%{localFieldContent}"> + <s:text name="vradi.text.edit"/> + </s:a> + </div> </div> <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-05-23 07:51:55 UTC (rev 42) +++ trunk/vradi-web/src/main/webapp/WEB-INF/jsp/formNoteList.jsp 2011-05-24 00:15:14 UTC (rev 43) @@ -24,9 +24,9 @@ <ul> <% for (FormNote note : action.getFormNotes()) { %> - <li><s:a action="formNote/<%=note.getWikittyId()%>"><%=note.getCreationDate()%> <%=note.getSummary()%></s:a></li> + <li><s:a action="formNote/%{note.getWikittyId()}"><%=note.getCreationDate()%> <%=note.getSummary()%></s:a></li> <% } %> - <li><s:a action="formNote/new?formId=<%=action.getFormId()%>"><s:text name="vradi.new.formNote"/></s:a></li> + <li><s:a action="formNote/new?formId=%{formId}"><s:text name="vradi.new.formNote"/></s:a></li> </ul> </body> </html>

1 0