Author: mfortun Date: 2011-05-09 18:08:27 +0200 (Mon, 09 May 2011) New Revision: 880 Url: http://nuiton.org/repositories/revision/wikitty/880 Log: * edit page in progress 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 trunk/wikitty-publication/src/main/webapp/index.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-09 15:48:29 UTC (rev 879) +++ trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/action/PublicationActionEdit.java 2011-05-09 16:08:27 UTC (rev 880) @@ -1,5 +1,8 @@ package org.nuiton.wikitty.publication.action; +import org.nuiton.wikitty.entities.Wikitty; +import org.nuiton.wikitty.entities.WikittyImpl; + import com.opensymphony.xwork2.ActionContext; public class PublicationActionEdit extends PublicationBaseAction{ @@ -9,13 +12,40 @@ */ private static final long serialVersionUID = -590087371230933701L; + + protected Wikitty wikitty; + static public PublicationActionEdit getAction() { return (PublicationActionEdit) ActionContext.getContext().get( CONTEXT_ACTION_KEY); } + @Override + public String execute() throws Exception { + + String id = getArgument("id", ""); + + if ("".equals(id)){ + wikitty = new WikittyImpl(); + }else{ + wikitty = getWikittyPublicationProxy().restore(id); + } + + + + return SUCCESS; + } + + public Wikitty getWikitty() { + return wikitty; + } + + public void setWikitty(Wikitty wikitty) { + this.wikitty = wikitty; + } + } Modified: trunk/wikitty-publication/src/main/resources/struts.xml =================================================================== --- trunk/wikitty-publication/src/main/resources/struts.xml 2011-05-09 15:48:29 UTC (rev 879) +++ trunk/wikitty-publication/src/main/resources/struts.xml 2011-05-09 16:08:27 UTC (rev 880) @@ -13,7 +13,7 @@ <package name="test" extends="struts-default"> - <action name="editPage" + <action name="*/edit/*" class="org.nuiton.wikitty.publication.action.PublicationActionEdit"> <param name="context">{1}</param> <param name="args">{2}</param> 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-09 15:48:29 UTC (rev 879) +++ trunk/wikitty-publication/src/main/webapp/WEB-INF/jsp/edit.jsp 2011-05-09 16:08:27 UTC (rev 880) @@ -28,6 +28,7 @@ Author : poussin --%> +<%@page import="org.nuiton.wikitty.publication.action.PublicationActionEdit"%> <%@page import="org.nuiton.wikitty.publication.ActionEval"%> <%@page import="org.apache.commons.lang.StringEscapeUtils"%> <%@page import="org.nuiton.wikitty.entities.FieldType"%> @@ -40,11 +41,20 @@ <%@page import="org.nuiton.wikitty.publication.WikittyPublicationContext"%> <% + +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); + +*/ +String url = "TODO"; %> <h1>Edit <%=wikitty.getId()%></h1> @@ -60,7 +70,7 @@ <legend><span class="legend">Extensions</span></legend> Current extension: <%=wikitty.getExtensionNames()%> <% - WikittyProxy proxy = context.getWikittyProxy(); + WikittyProxy proxy = action.getWikittyPublicationProxy(); Collection<String> allExt = proxy.getAllExtensionIds(); if (allExt != null && allExt.size() > 0) { %> Modified: trunk/wikitty-publication/src/main/webapp/index.jsp =================================================================== --- trunk/wikitty-publication/src/main/webapp/index.jsp 2011-05-09 15:48:29 UTC (rev 879) +++ trunk/wikitty-publication/src/main/webapp/index.jsp 2011-05-09 16:08:27 UTC (rev 880) @@ -17,7 +17,7 @@ </s:a> -<s:url var="regenPermToken" action="edit" /> +<s:url var="regenPermToken" action="wiki/edit" /> <s:a href="%{regenPermToken}" id="regenPermToken"> <s:text name="edit" /> </s:a>