test/cuba
1
0
Fork 0
mirror of https://gitee.com/jmix/cuba.git synced 2024-12-03 03:38:33 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Refactoring #PL-6020

Browse Source
This commit is contained in:
Aleksey Kozyaikin 2015-09-22 13:38:57 +00:00
parent 6e8ac0fa75
commit 5eb729e607
4 changed files with 33 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
modules/web/src/com/haulmont/cuba/web/AppUI.java
View File

@ -40,8 +40,6 @@ public class AppUI extends UI implements ErrorHandler {
public static final String LAST_REQUEST_PARAMS_ATTR = "lastRequestParams";
public static final String FROM_HTML_REDIRECT_PARAM = "fromCubaHtmlRedirect";
private final static Logger log = LoggerFactory.getLogger(AppUI.class);

4
modules/web/src/com/haulmont/cuba/web/WebConfig.java
View File

@ -242,7 +242,7 @@ public interface WebConfig extends Config {
/**
* @return Whether to redirect by blank html page on getting URL request action
*/
@Property("cuba.web.redirectByPageOnLinkActionEnabled")
@Property("cuba.web.useRedirectWithBlankPageForLinkAction")
@DefaultBoolean(false)
boolean getRedirectByPageOnLinkActionEnabled();
boolean getUseRedirectWithBlankPageForLinkAction();
}

35
modules/web/src/com/haulmont/cuba/web/sys/CubaApplicationServlet.java
View File

@ -4,6 +4,7 @@
*/
package com.haulmont.cuba.web.sys;
import com.google.common.base.Charsets;
import com.haulmont.cuba.core.global.AppBeans;
import com.haulmont.cuba.core.global.Configuration;
import com.haulmont.cuba.web.AppUI;
@ -12,6 +13,7 @@ import com.haulmont.cuba.web.app.WebStatisticsAccumulator;
import com.haulmont.cuba.web.auth.RequestContext;
import com.vaadin.server.*;
import com.vaadin.shared.ApplicationConstants;
import org.apache.commons.io.IOUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@ -39,6 +41,8 @@ public class CubaApplicationServlet extends VaadinServlet {
private static final long serialVersionUID = -8701539520754293569L;
public static final String FROM_HTML_REDIRECT_PARAM = "fromCubaHtmlRedirect";
private Logger log = LoggerFactory.getLogger(CubaApplicationServlet.class);
protected WebConfig webConfig;
@ -121,10 +125,10 @@ public class CubaApplicationServlet extends VaadinServlet {
boolean needRedirect = action != null;
if (needRedirect) {
if (webConfig.getRedirectByPageOnLinkActionEnabled() &&
if (webConfig.getUseRedirectWithBlankPageForLinkAction() &&
action != null &&
request.getParameter(AppUI.FROM_HTML_REDIRECT_PARAM) == null) {
redirectByBlankHtmlPage(request, response);
request.getParameter(FROM_HTML_REDIRECT_PARAM) == null) {
redirectWithBlankHtmlPage(request, response);
} else {
redirectToApp(request, response, contextName, uriParts, action);
}
@ -133,7 +137,7 @@ public class CubaApplicationServlet extends VaadinServlet {
}
}
protected void redirectByBlankHtmlPage(HttpServletRequest request, HttpServletResponse response)
protected void redirectWithBlankHtmlPage(HttpServletRequest request, HttpServletResponse response)
throws IOException {
final BufferedWriter page = new BufferedWriter(new OutputStreamWriter(
@ -143,7 +147,7 @@ public class CubaApplicationServlet extends VaadinServlet {
stringBuilder.append(request.getRequestURI());
Map<String, String[]> parameterMap = request.getParameterMap();
stringBuilder.append("?");
stringBuilder.append(AppUI.FROM_HTML_REDIRECT_PARAM);
stringBuilder.append(FROM_HTML_REDIRECT_PARAM);
stringBuilder.append("=true");
for (String key : parameterMap.keySet()) {
@ -156,23 +160,8 @@ public class CubaApplicationServlet extends VaadinServlet {
}
String url = stringBuilder.toString();
page.write("<!DOCTYPE HTML>");
page.write("<head>");
page.write("<meta charset=\"UTF-8\"");
page.write("<meta http-equiv=\"refresh\" content=\"1;url=");
page.write(url);
page.write("\">");
page.write("<script type=\"text/javascript\">");
page.write("<meta charset=\"UTF-8\">");
page.write("<meta http-equiv=\"refresh\" content=\"1;url=");
page.write(url);
page.write("\"><script type=\"text/javascript\">");
page.write("window.location.href = \"");
page.write(url);
page.write("\"</script>");
page.write("</head>");
page.write("<body/>");
page.write("</html>");
page.write(String.format(IOUtils.toString(CubaApplicationServlet.class.getResourceAsStream("redirect-page-template.html"),
Charsets.UTF_8.name()), url, url, url));
page.close();
}
@ -197,7 +186,7 @@ public class CubaApplicationServlet extends VaadinServlet {
Enumeration parameterNames = request.getParameterNames();
while (parameterNames.hasMoreElements()) {
String name = (String) parameterNames.nextElement();
if (!AppUI.FROM_HTML_REDIRECT_PARAM.equals(name)) {
if (!FROM_HTML_REDIRECT_PARAM.equals(name)) {
params.put(name, request.getParameter(name));
}
}

19
modules/web/src/com/haulmont/cuba/web/sys/redirect-page-template.html Normal file
View File

@ -0,0 +1,19 @@
<!DOCTYPE HTML>
<!--
~ Copyright (c) 2008-2015 Haulmont. All rights reserved.
~ Use is subject to license terms, see http://www.cuba-platform.com/license for details.
-->
<html>
<head>
<meta charset="UTF-8">
<meta http-equiv="refresh" content="1;url=%s">
<script type="text/javascript">
<meta charset="UTF-8">
<meta http-equiv="refresh" content="1;url=%s">
<script type="text/javascript">
window.location.href = "%s"
</script>
</head>
<body/>
</html>