Author: mfortun Date: 2011-05-23 18:16:03 +0200 (Mon, 23 May 2011) New Revision: 913 Url: http://nuiton.org/repositories/revision/wikitty/913 Log: * file are uploaded but not store inside wikittyPubData Modified: trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/action/PublicationActionEdit.java trunk/wikitty-publication/src/main/resources/struts.xml trunk/wikitty-publication/src/main/webapp/WEB-INF/jsp/edit.jsp Modified: trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/action/PublicationActionEdit.java =================================================================== --- trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/action/PublicationActionEdit.java 2011-05-23 09:31:33 UTC (rev 912) +++ trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/action/PublicationActionEdit.java 2011-05-23 16:16:03 UTC (rev 913) @@ -1,5 +1,6 @@ package org.nuiton.wikitty.publication.action; +import java.io.File; import java.util.ArrayList; import java.util.Collection; import java.util.HashMap; @@ -38,7 +39,10 @@ private HashMap<String, Object> wikittyFieldMap; + protected File upload;//The actual file + + static public PublicationActionEdit getAction() { return (PublicationActionEdit) ActionContext.getContext().get( CONTEXT_ACTION_KEY); @@ -46,7 +50,8 @@ @Override public String execute() throws Exception { - + System.out.println(upload); + doAction(); @@ -218,6 +223,19 @@ + + public File getUpload() { + return upload; + } + + public void setFile(File upload){ + this.upload = upload; + } + + public void setUpload(File upload) { + this.upload = upload; + } + public Wikitty getWikitty() { Modified: trunk/wikitty-publication/src/main/resources/struts.xml =================================================================== --- trunk/wikitty-publication/src/main/resources/struts.xml 2011-05-23 09:31:33 UTC (rev 912) +++ trunk/wikitty-publication/src/main/resources/struts.xml 2011-05-23 16:16:03 UTC (rev 913) @@ -15,7 +15,7 @@ <interceptors> <interceptor-stack name="publicAreaStack"> <interceptor-ref name="defaultStack"> - + <param name="fileUpload.maximumSize">104857600</param> </interceptor-ref> </interceptor-stack> </interceptors> Modified: trunk/wikitty-publication/src/main/webapp/WEB-INF/jsp/edit.jsp =================================================================== --- trunk/wikitty-publication/src/main/webapp/WEB-INF/jsp/edit.jsp 2011-05-23 09:31:33 UTC (rev 912) +++ trunk/wikitty-publication/src/main/webapp/WEB-INF/jsp/edit.jsp 2011-05-23 16:16:03 UTC (rev 913) @@ -36,30 +36,21 @@ <%@page import="org.nuiton.wikitty.WikittyService"%> <%@page import="org.nuiton.wikitty.entities.WikittyExtension"%> <%@page import="org.nuiton.wikitty.entities.Wikitty"%> +<%@ taglib prefix="s" uri="/struts-tags" %> - <% PublicationActionEdit action = PublicationActionEdit.getAction(); Wikitty wikitty = action.getWikitty(); - -/* -WikittyPublicationContext context = (WikittyPublicationContext) - request.getAttribute(ActionEval.CONTEXT_VAR); -Wikitty wikitty = (Wikitty)request.getAttribute(ActionEval.WIKITTY_VAR); -ActionEdit action = context.getAction(ActionEdit.class); -String url = action.makeUrl(context, wikitty); - -*/ - %> <h1>Edit <%=wikitty.getId()%></h1> <pre><%=StringEscapeUtils.escapeHtml(String.valueOf(wikitty))%></pre> - -<form class="edit" action="<%=action.getPostUrl()%>" method="post" > +<s:set var="urlPost"><%=action.getPostUrl()%></s:set> +<s:form action="%{#urlPost}" method="POST" enctype="multipart/form-data"> +<!-- <form class="edit" action="" method="post" enctype="multipart/form-data" > --> <input type="hidden" name="id" value="<%=wikitty.getId()%>" /> <input type="hidden" name="version" value="<%=wikitty.getVersion()%>" /> <input type="hidden" name="extensions" value="<%=wikitty.getExtensionNames()%>"/> @@ -107,7 +98,11 @@ switch(fieldType.getType()) { case BINARY: %> - <input type="file" name="<%=extName%>.<%=fieldName%>"/> + + <input type="hidden" name="<%=extName%>.<%=fieldName%>" value="file" /> + <input type="file" name="File" label ="File"/> + <!-- <s:file name="file" label="File"/> --> + <% break; case BOOLEAN: @@ -153,4 +148,5 @@ %> <input type="submit" name="store" value="Store" /> <input type="submit" name="delete" value="Delete" /> -</form> + </s:form> +<!-- </form> --> \ No newline at end of file