Author: mfortun Date: 2011-06-07 10:34:47 +0200 (Tue, 07 Jun 2011) New Revision: 935 Url: http://nuiton.org/repositories/revision/wikitty/935 Log: * Correct url construction in redirect mechanism * Correct url construction in view page for view link Modified: trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/LoginInterceptor.java trunk/wikitty-publication/src/main/webapp/WEB-INF/jsp/view.jsp Modified: trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/LoginInterceptor.java =================================================================== --- trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/LoginInterceptor.java 2011-06-06 15:28:53 UTC (rev 934) +++ trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/LoginInterceptor.java 2011-06-07 08:34:47 UTC (rev 935) @@ -24,15 +24,11 @@ package org.nuiton.wikitty.publication; import java.util.Map; - -import javax.servlet.ServletRequest; import javax.servlet.http.HttpServletRequest; - import org.apache.struts2.ServletActionContext; -import org.apache.struts2.interceptor.RequestAware; import org.nuiton.wikitty.entities.WikittyUser; -import org.nuiton.wikitty.publication.action.PublicationActionView; + import com.opensymphony.xwork2.ActionContext; import com.opensymphony.xwork2.ActionInvocation; import com.opensymphony.xwork2.interceptor.AbstractInterceptor; @@ -66,12 +62,14 @@ HttpServletRequest request = ServletActionContext.getRequest(); - error = request.getContextPath() + error ; - error += "?success="+request.getServletPath(); + + // Construct redirect url. + String redirect = request.getContextPath() + error ; + redirect += "?success="+request.getServletPath(); // If the user isn't logged in if (user == null) { - ServletActionContext.getResponse().sendRedirect(error); + ServletActionContext.getResponse().sendRedirect(redirect); } else { result = invocation.invoke(); } Modified: trunk/wikitty-publication/src/main/webapp/WEB-INF/jsp/view.jsp =================================================================== --- trunk/wikitty-publication/src/main/webapp/WEB-INF/jsp/view.jsp 2011-06-06 15:28:53 UTC (rev 934) +++ trunk/wikitty-publication/src/main/webapp/WEB-INF/jsp/view.jsp 2011-06-07 08:34:47 UTC (rev 935) @@ -108,13 +108,16 @@ action="%{#localContext}/eval/elt_id:%{#wid}" /> <a href="${urleval}">Eval</a> <a id="ajaxlink_<%=i%>" href="javascript:void(0)">View</a> + + <s:url + var="urlFragment" action="/fragment/wikittyInfo" /> <script type='text/javascript'> jQuery(document).ready(function () { var options_ajaxlink_<%=i%> = {}; options_ajaxlink_<%=i%>.jqueryaction = "anchor"; options_ajaxlink_<%=i%>.id = "ajaxlink_<%=i%>"; options_ajaxlink_<%=i%>.targets = "partnersInfo"; - options_ajaxlink_<%=i%>.href = "/wikitty-publication/fragment/wikittyInfo.action"; + options_ajaxlink_<%=i%>.href = "${urlFragment}"; options_ajaxlink_<%=i%>.hrefparameter = "id=<%=w.getId()%>"; jQuery.struts2_jquery.bind(jQuery('#ajaxlink_<%=i%>'),options_ajaxlink_<%=i%>); });