Author: mfortun Date: 2011-05-20 16:09:19 +0200 (Fri, 20 May 2011) New Revision: 908 Url: http://nuiton.org/repositories/revision/wikitty/908 Log: * Correct url construction in view page Modified: trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/action/PublicationActionView.java trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/action/PublicationBaseAction.java trunk/wikitty-publication/src/main/resources/struts.xml trunk/wikitty-publication/src/main/webapp/WEB-INF/jsp/view.jsp Modified: trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/action/PublicationActionView.java =================================================================== --- trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/action/PublicationActionView.java 2011-05-20 10:19:56 UTC (rev 907) +++ trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/action/PublicationActionView.java 2011-05-20 14:09:19 UTC (rev 908) @@ -1,24 +1,22 @@ package org.nuiton.wikitty.publication.action; - import org.nuiton.wikitty.entities.Wikitty; import org.nuiton.wikitty.search.Criteria; import org.nuiton.wikitty.search.PagedResult; import org.nuiton.wikitty.search.Search; -import org.nuiton.wikitty.search.operators.Element; - import com.opensymphony.xwork2.ActionContext; -public class PublicationActionView extends PublicationBaseAction { +public class PublicationActionView extends PublicationBaseAction { protected PagedResult<Wikitty> pagedResult; protected Wikitty wikittyResult; protected String search = "*"; protected int first = 0; protected int end = 100; - + + /** * */ @@ -32,12 +30,15 @@ @Override public String execute() throws Exception { + // search = this.getArgument("r", "*"); // first = this.getArgument("first", "0"); // end = this.getArgument("end", "100"); String id = getArgument("id", ""); + + if (!"".equals(id)) { wikittyResult = getWikittyPublicationProxy().restore(id); } @@ -102,14 +103,7 @@ this.end = end; } - public String makeUrlEdit(Wikitty w) { + - String result = getArgument("context", "") + "/edit/" + Element.ELT_ID - + ":" + w.getId() + ".action"; - return (result); - - } - - } Modified: trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/action/PublicationBaseAction.java =================================================================== --- trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/action/PublicationBaseAction.java 2011-05-20 10:19:56 UTC (rev 907) +++ trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/action/PublicationBaseAction.java 2011-05-20 14:09:19 UTC (rev 908) @@ -122,4 +122,14 @@ } + + public String getContextArgs(){ + return (String) ActionContext.getContext().getParameters().get(CONTEXT_KEY); + } + + public String getArgs(){ + return (String) ActionContext.getContext().getParameters().get(ARGS_KEY); + } + + } Modified: trunk/wikitty-publication/src/main/resources/struts.xml =================================================================== --- trunk/wikitty-publication/src/main/resources/struts.xml 2011-05-20 10:19:56 UTC (rev 907) +++ trunk/wikitty-publication/src/main/resources/struts.xml 2011-05-20 14:09:19 UTC (rev 908) @@ -5,106 +5,106 @@ <struts> - <constant name="struts.devMode" value="true" /> - <constant name="struts.ognl.allowStaticMethodAccess" value="true" /> - <constant name="struts.enable.SlashesInActionNames" value="true" /> + <constant name="struts.devMode" value="true" /> + <constant name="struts.ognl.allowStaticMethodAccess" value="true" /> + <constant name="struts.enable.SlashesInActionNames" value="true" /> - <!-- basic interceptor stack use redefine our stack --> - <package name="publicArea" extends="struts-default"> - <interceptors> - <interceptor-stack name="publicAreaStack"> - <interceptor-ref name="defaultStack"> + <!-- basic interceptor stack use redefine our stack --> + <package name="publicArea" extends="struts-default"> + <interceptors> + <interceptor-stack name="publicAreaStack"> + <interceptor-ref name="defaultStack"> - </interceptor-ref> - </interceptor-stack> - </interceptors> - <default-interceptor-ref name="publicAreaStack" /> - </package> + </interceptor-ref> + </interceptor-stack> + </interceptors> + <default-interceptor-ref name="publicAreaStack" /> + </package> - <!-- Define a package for the login area --> - <package name="loginArea" extends="publicArea"> - <interceptors> - <interceptor name="logout" - class="org.nuiton.wikitty.publication.LogoutInterceptor" /> - <interceptor-stack name="loginAreaStack"> - <interceptor-ref name="logout" /> - <interceptor-ref name="publicAreaStack" /> - </interceptor-stack> - </interceptors> - <default-interceptor-ref name="loginAreaStack" /> - </package> + <!-- Define a package for the login area --> + <package name="loginArea" extends="publicArea"> + <interceptors> + <interceptor name="logout" + class="org.nuiton.wikitty.publication.LogoutInterceptor" /> + <interceptor-stack name="loginAreaStack"> + <interceptor-ref name="logout" /> + <interceptor-ref name="publicAreaStack" /> + </interceptor-stack> + </interceptors> + <default-interceptor-ref name="loginAreaStack" /> + </package> - <!-- Define a package for the restricted area must be logged to access --> - <package name="restrictedArea" extends="publicArea"> - <interceptors> - <interceptor name="login" - class="org.nuiton.wikitty.publication.LoginInterceptor"> - <param name="error">login_input.action</param> - </interceptor> - <interceptor-stack name="restrictedAreaStack"> - <interceptor-ref name="login" /> - <interceptor-ref name="publicAreaStack" /> - </interceptor-stack> - </interceptors> - <default-interceptor-ref name="restrictedAreaStack" /> - </package> + <!-- Define a package for the restricted area must be logged to access --> + <package name="restrictedArea" extends="publicArea"> + <interceptors> + <interceptor name="login" + class="org.nuiton.wikitty.publication.LoginInterceptor"> + <param name="error">/login_input.action</param> + </interceptor> + <interceptor-stack name="restrictedAreaStack"> + <interceptor-ref name="login" /> + <interceptor-ref name="publicAreaStack" /> + </interceptor-stack> + </interceptors> + <default-interceptor-ref name="restrictedAreaStack" /> + </package> - <package name="login" extends="loginArea"> - <action name="register_*" method="{1}" - class="org.nuiton.wikitty.publication.action.PublicationActionRegister"> - <result name="input">register.jsp</result> - <result type="redirect">index.jsp</result> - </action> - <action name="login_*" method="{1}" - class="org.nuiton.wikitty.publication.action.PublicationActionLogin"> - <result name="input">login.jsp</result> - <result name="success" type="redirect">${success}</result> - <result name="error" type="redirect">${error}</result> - </action> - <action name="logout" - class="org.nuiton.wikitty.publication.action.PublicationActionLogout"> - <result type="redirect">${success}</result> - </action> - </package> + <package name="login" extends="loginArea"> + <action name="register_*" method="{1}" + class="org.nuiton.wikitty.publication.action.PublicationActionRegister"> + <result name="input">/register.jsp</result> + <result type="redirect">/index.jsp</result> + </action> + <action name="login_*" method="{1}" + class="org.nuiton.wikitty.publication.action.PublicationActionLogin"> + <result name="input">login.jsp</result> + <result name="success" type="redirect">${success}</result> + <result name="error" type="redirect">${error}</result> + </action> + <action name="logout" + class="org.nuiton.wikitty.publication.action.PublicationActionLogout"> + <result type="redirect">${success}</result> + </action> + </package> - <!-- Action aviable only to logged user extends="restrictedArea"--> - <package name="publication" extends="restrictedArea"> + <!-- Action aviable only to logged user extends="restrictedArea" --> + <package name="publication" extends="restrictedArea"> - <action name="*/edit/*" - class="org.nuiton.wikitty.publication.action.PublicationActionEdit"> - <param name="context">{1}</param> - <param name="args">{2}</param> - <result>/WEB-INF/jsp/edit.jsp</result> - </action> + <action name="*/edit/*" + class="org.nuiton.wikitty.publication.action.PublicationActionEdit"> + <param name="context">{1}</param> + <param name="args">{2}</param> + <result>/WEB-INF/jsp/edit.jsp</result> + </action> - <action name="*/view/*" - class="org.nuiton.wikitty.publication.action.PublicationActionView"> - <param name="context">{1}</param> - <param name="args">{2}</param> - <result>/WEB-INF/jsp/view.jsp</result> - </action> + <action name="*/view/*" + class="org.nuiton.wikitty.publication.action.PublicationActionView"> + <param name="context">{1}</param> + <param name="args">{2}</param> + <result>/WEB-INF/jsp/view.jsp</result> + </action> - <action name="*/raw/*" - class="org.nuiton.wikitty.publication.action.PublicationActionRaw"> - <param name="context">{1}</param> - <param name="args">{2}</param> - <result type="stream"> - <param name="contentType">mimeType</param> - <param name="inputName">inputStream</param> - </result> - </action> + <action name="*/raw/*" + class="org.nuiton.wikitty.publication.action.PublicationActionRaw"> + <param name="context">{1}</param> + <param name="args">{2}</param> + <result type="stream"> + <param name="contentType">mimeType</param> + <param name="inputName">inputStream</param> + </result> + </action> - <action name="*/eval/*" - class="org.nuiton.wikitty.publication.action.PublicationActionEval"> - <param name="context">{1}</param> - <param name="args">{2}</param> - <result type="stream"> - <param name="contentType">mimeType</param> - <param name="inputName">inputStream</param> - </result> - </action> - </package> + <action name="*/eval/*" + class="org.nuiton.wikitty.publication.action.PublicationActionEval"> + <param name="context">{1}</param> + <param name="args">{2}</param> + <result type="stream"> + <param name="contentType">mimeType</param> + <param name="inputName">inputStream</param> + </result> + </action> + </package> </struts> Modified: trunk/wikitty-publication/src/main/webapp/WEB-INF/jsp/view.jsp =================================================================== --- trunk/wikitty-publication/src/main/webapp/WEB-INF/jsp/view.jsp 2011-05-20 10:19:56 UTC (rev 907) +++ trunk/wikitty-publication/src/main/webapp/WEB-INF/jsp/view.jsp 2011-05-20 14:09:19 UTC (rev 908) @@ -92,11 +92,12 @@ for (Wikitty w : action.getPagedResult().getAll()) { %> <tr> - <td><s:url var="editlink" action="wiki/edit"> - <s:param name="id"><%=w.getId()%></s:param> - </s:url> <s:a href="%{editlink}" id="regenPermToken"> - <s:text name="edit" /> - </s:a> <a href="<%=action.makeUrlEdit(w)%>">edit</a></td> + <td><s:set var="wid"><%=w.getId()%></s:set> <s:set var="localContext"><%=action.getContextArgs()%></s:set> + <s:url var="urledit" action="%{#localContext}/edit/elt_id:%{#wid}" /> + <a href="${urledit}">Edit</a> <s:url var="urlraw" + action="%{#localContext}/raw/elt_id:%{#wid}" /> <a href="${urlraw}">Raw</a> + <s:url var="urleval" action="%{#localContext}/eval/elt_id:%{#wid}" /> + <a href="${urleval}">Eval</a></td> <td><input type="submit" name="id" value="<%=w.getId()%>" /> </td>