details: /erp/devel/pi/rev/50c83574cdc9
changeset: 11135:50c83574cdc9
user: Martin Taal <martin.taal <at> openbravo.com>
date: Wed Mar 09 12:04:08 2011 +0100
summary: Set view as active when directly opening a record
details: /erp/devel/pi/rev/ebf9e80e7ce4
changeset: 11136:ebf9e80e7ce4
user: Martin Taal <martin.taal <at> openbravo.com>
date: Wed Mar 09 12:04:25 2011 +0100
summary: Solve issue that where and other parameters are not passed to the
server
details: /erp/devel/pi/rev/1097ad23966d
changeset: 11137:1097ad23966d
user: Martin Taal <martin.taal <at> openbravo.com>
date: Wed Mar 09 12:05:01 2011 +0100
summary: Direct link url now passes through login
diffstat:
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/ob-standard-view-datasource.js
| 12 ++------
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/ob-standard-view.js
| 1 +
src-core/src/org/openbravo/base/VariablesBase.java
| 13 ++++++++-
src/org/openbravo/authentication/basic/DefaultAuthenticationManager.java
| 3 ++
src/org/openbravo/erpCommon/security/Menu.java
| 9 ++++++-
5 files changed, 26 insertions(+), 12 deletions(-)
diffs (106 lines):
diff -r 61f174927bf2 -r 1097ad23966d
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/ob-standard-view-datasource.js
---
a/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/ob-standard-view-datasource.js
Wed Mar 09 11:14:44 2011 +0100
+++
b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/ob-standard-view-datasource.js
Wed Mar 09 12:05:01 2011 +0100
@@ -180,18 +180,12 @@
// properties.
getTabInfoRequestProperties: function(theView, requestProperties){
if (theView && theView.tabId) {
- var tabParam = {
- params: {
+ requestProperties.params = requestProperties.params || {};
+ isc.addProperties(requestProperties.params, {
windowId: theView.standardWindow.windowId,
tabId: theView.tabId,
moduleId: theView.moduleId
- }
- };
- if (requestProperties) {
- isc.addProperties(requestProperties, tabParam);
- } else {
- requestProperties = tabParam;
- }
+ });
}
return requestProperties;
}
diff -r 61f174927bf2 -r 1097ad23966d
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/ob-standard-view.js
---
a/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/ob-standard-view.js
Wed Mar 09 11:14:44 2011 +0100
+++
b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/ob-standard-view.js
Wed Mar 09 12:05:01 2011 +0100
@@ -967,6 +967,7 @@
this.editRecord(gridRecord);
}
}
+ this.setAsActiveView();
// remove this info
delete this.standardWindow.directTabInfo;
diff -r 61f174927bf2 -r 1097ad23966d
src-core/src/org/openbravo/base/VariablesBase.java
--- a/src-core/src/org/openbravo/base/VariablesBase.java Wed Mar 09
11:14:44 2011 +0100
+++ b/src-core/src/org/openbravo/base/VariablesBase.java Wed Mar 09
12:05:01 2011 +0100
@@ -1410,6 +1410,7 @@
if (log4j.isDebugEnabled())
log4j.debug("...: removing session");
String target = "";
+ String targetQueryString = null;
try {
String sessionName;
Enumeration<?> e = session.getAttributeNames();
@@ -1417,16 +1418,24 @@
sessionName = (String) e.nextElement();
if (log4j.isDebugEnabled())
log4j.debug(" session name: " + sessionName);
- if (!all && sessionName.equalsIgnoreCase("target"))
+ if (!all && sessionName.equalsIgnoreCase("target")) {
target = (String) session.getAttribute(sessionName);
+ }
+ if (!all && sessionName.equalsIgnoreCase("targetQueryString")) {
+ targetQueryString = (String) session.getAttribute(sessionName);
+ }
session.removeAttribute(sessionName);
e = session.getAttributeNames();
}
} catch (Exception e) {
log4j.error("clearSession error " + e);
}
- if (!target.equals(""))
+ if (!target.equals("")) {
session.setAttribute("TARGET", target);
+ }
+ if (targetQueryString != null) {
+ session.setAttribute("TARGETQUERYSTRING", targetQueryString);
+ }
}
/**
diff -r 61f174927bf2 -r 1097ad23966d
src/org/openbravo/authentication/basic/DefaultAuthenticationManager.java
--- a/src/org/openbravo/authentication/basic/DefaultAuthenticationManager.java
Wed Mar 09 11:14:44 2011 +0100
+++ b/src/org/openbravo/authentication/basic/DefaultAuthenticationManager.java
Wed Mar 09 12:05:01 2011 +0100
@@ -86,6 +86,9 @@
// Storing target string to redirect after a successful login
variables.setSessionValue("target", strDireccionLocal +
"/security/Menu.html"
+ (qString != null && !qString.equals("") ? "?" + qString : ""));
+ if (qString != null && !qString.equals("")) {
+ variables.setSessionValue("targetQueryString", qString);
+ }
if (strAjax != null && !strAjax.equals(""))
bdErrorAjax(response, "Error", "", Utility.messageBD(this.conn,
"NotLogged", variables
diff -r 61f174927bf2 -r 1097ad23966d
src/org/openbravo/erpCommon/security/Menu.java
--- a/src/org/openbravo/erpCommon/security/Menu.java Wed Mar 09 11:14:44
2011 +0100
+++ b/src/org/openbravo/erpCommon/security/Menu.java Wed Mar 09 12:05:01
2011 +0100
@@ -71,7 +71,14 @@
OBContext.getOBContext().getUser(),
OBContext.getOBContext().getRole(), null);
// redirect if the startpage is there and if it is not the same as the
standard
if (startPage != null && !startPage.endsWith("/security/Menu.html")) {
- response.sendRedirect(".." + startPage);
+ final String storedQueryString =
vars.getSessionValue("targetQueryString");
+ if (storedQueryString != null && storedQueryString.length() > 0) {
+ final String separator = startPage.contains("?") ? "&" : "?";
+ response.sendRedirect(".." + startPage + separator +
storedQueryString);
+ } else {
+ response.sendRedirect(".." + startPage);
+ }
+ vars.removeSessionValue("target");
return;
}
} catch (PropertyConflictException e) {
------------------------------------------------------------------------------
Colocation vs. Managed Hosting
A question and answer guide to determining the best fit
for your organization - today and in the future.
http://p.sf.net/sfu/internap-sfd2d
_______________________________________________
Openbravo-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/openbravo-commits
