Minor code tweaks
This commit is contained in:
parent
29544748e3
commit
a028aca8d4
1 changed files with 6 additions and 16 deletions
|
@ -68,22 +68,12 @@
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/* The parameter extra=true is just for ie6. */
|
if( resourceToRedirectTo != null ){ %>
|
||||||
if( resourceToRedirectTo != null ){
|
|
||||||
if( urlPattern != null && ( urlPattern.endsWith("entity") || urlPattern.endsWith("individual") )){ %>
|
|
||||||
<%-- Here we're building the redirect URL to include an (unencoded) fragment identifier such as: #propertyName --%>
|
|
||||||
<c:url context="/" var="encodedUrl" value="<%=urlPattern%>">
|
<c:url context="/" var="encodedUrl" value="<%=urlPattern%>">
|
||||||
<c:param name="uri" value="<%=resourceToRedirectTo%>" />
|
<c:param name="uri" value="<%=resourceToRedirectTo%>" />
|
||||||
<c:param name="extra" value="true"/>
|
<c:param name="extra" value="true"/> <%-- For ie6 --%>
|
||||||
</c:url>
|
</c:url>
|
||||||
<c:redirect url="${encodedUrl}${predicateAnchor}" />
|
<c:redirect url="${encodedUrl}${predicateAnchor}" />
|
||||||
<% } else { %>
|
|
||||||
<c:url context="/" var="encodedUrl" value="<%=urlPattern%>">
|
|
||||||
<c:param name="uri" value="<%=resourceToRedirectTo%>" />
|
|
||||||
<c:param name="extra" value="true"/>
|
|
||||||
</c:url>
|
|
||||||
<c:redirect url="${encodedUrl}${predicateAnchor}" />
|
|
||||||
<%} %>
|
|
||||||
<% } else { %>
|
<% } else { %>
|
||||||
<c:redirect url="<%= Controllers.LOGIN %>" />
|
<c:redirect url="<%= Controllers.LOGIN %>" />
|
||||||
<% } %>
|
<% } %>
|
||||||
|
|
Loading…
Add table
Reference in a new issue