details: https://code.openbravo.com/erp/devel/pi/rev/2d3dfb5d3eaf
changeset: 24258:2d3dfb5d3eaf
user: Rafa Alonso <rafael.alonso <at> openbravo.com>
date: Thu Aug 14 20:54:39 2014 +0200
summary: Fixes issue 26953: Better solution to handle the ERP redirection
diffstat:
modules/org.openbravo.client.kernel/src/org/openbravo/client/kernel/BaseKernelServlet.java
| 13 ++++-----
1 files changed, 6 insertions(+), 7 deletions(-)
diffs (24 lines):
diff -r 74d15eec44db -r 2d3dfb5d3eaf
modules/org.openbravo.client.kernel/src/org/openbravo/client/kernel/BaseKernelServlet.java
---
a/modules/org.openbravo.client.kernel/src/org/openbravo/client/kernel/BaseKernelServlet.java
Thu Aug 14 12:09:54 2014 +0200
+++
b/modules/org.openbravo.client.kernel/src/org/openbravo/client/kernel/BaseKernelServlet.java
Thu Aug 14 20:54:39 2014 +0200
@@ -66,14 +66,13 @@
logout(request, localResponse);
}
- if (localResponse.getRedirectTarget() != null) {
+ // get where the request originated or pick up the
localResponse.getRedirectTarget()
+ String referer = RequestContext.get().getRequest().getHeader("referer");
+ if (referer == null) {
+ referer = localResponse.getRedirectTarget();
+ }
+ if (referer != null) {
if (!response.isCommitted()) {
- // get where the request originated
- String referer =
RequestContext.get().getRequest().getHeader("referer");
- // if we can't get where the request originated, redirect to the ERP
- if (referer == null) {
- referer = localResponse.getRedirectTarget();
- }
// will this always work.... not if the writer is already closed
response.getWriter().write("window.location.href = '" + referer +
"';");
response.setHeader("Content-Type",
KernelConstants.JAVASCRIPT_CONTENTTYPE);
------------------------------------------------------------------------------
_______________________________________________
Openbravo-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/openbravo-commits
