[OpenbravoERP-commits] devel/pi: 2 new changesets
details: https://code.openbravo.com/erp/devel/pi/rev/bf199b193c83
changeset: 32323:bf199b193c83
user: Inigo Sanchez openbravo.com>
date: Tue Jun 20 01:31:01 2017 +0200
summary: Fixed issue 33833: Products can not be added to node from popup
Products can not be added to node from popup because an
IndexOutOfBoundsException
is thrown. To avoid this problem a check is added. Besides another check is
added
in order to avoid a NPE.
details: https://code.openbravo.com/erp/devel/pi/rev/540e39d05914
changeset: 32324:540e39d05914
user: Inigo Sanchez openbravo.com>
date: Tue Jun 20 01:33:48 2017 +0200
summary: Related with issue 33833: Applied JSBeautifier properly
diffstat:
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/process/ob-parameter-window-form.js
| 7 +--
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/process/ob-parameter-window-view.js
| 2 +-
2 files changed, 6 insertions(+), 3 deletions(-)
diffs (36 lines):
diff -r 5cd8c36d0974 -r 540e39d05914
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/process/ob-parameter-window-form.js
---
a/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/process/ob-parameter-window-form.js
Mon Jun 19 14:23:31 2017 +
+++
b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/process/ob-parameter-window-form.js
Tue Jun 20 01:33:48 2017 +0200
@@ -11,7 +11,7 @@
* under the License.
* The Original Code is Openbravo ERP.
* The Initial Developer of the Original Code is Openbravo SLU
- * All portions are Copyright (C) 2014-2016 Openbravo SLU
+ * All portions are Copyright (C) 2014-2017 Openbravo SLU
* All Rights Reserved.
* Contributor(s): __.
@@ -66,7 +66,10 @@
}
// Check validation rules (subordinated fields), when value of a
// parent field is changed, all its subordinated are reset
-affectedParams = this.paramWindow.dynamicColumns[item.name];
+var dynamicColumns = this.paramWindow.dynamicColumns;
+if (dynamicColumns && dynamicColumns[item.name]) {
+ affectedParams = dynamicColumns[item.name];
+}
if (affectedParams) {
for (i = 0; i < affectedParams.length; i++) {
field = this.getField(affectedParams[i]);
diff -r 5cd8c36d0974 -r 540e39d05914
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/process/ob-parameter-window-view.js
---
a/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/process/ob-parameter-window-view.js
Mon Jun 19 14:23:31 2017 +
+++
b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/process/ob-parameter-window-view.js
Tue Jun 20 01:33:48 2017 +0200
@@ -222,7 +222,7 @@
tab.setTitle(OB.I18N.getLabel('OBUIAPP_ProcessTitle_Done',
[this.tabTitle]));
}
-if (data.showResultsInProcessView) {
+if (data && data.showResultsInProcessView) {
if (!this.resultLayout) {
this.resultLayout = isc.HLayout.create({
width: '100%',
--
Check out the vibrant tech community on one of the world's most
engaging tech sites, Slashdot.org! http://sdm.link/slashdot
___
Openbravo-commits mailing list
Openbravo-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/openbravo-commits
[OpenbravoERP-commits] devel/pi: 2 new changesets
details: https://code.openbravo.com/erp/devel/pi/rev/2bb472b1616b changeset: 32321:2bb472b1616b user: RM packaging bot openbravo.com> date: Mon Jun 19 14:09:31 2017 + summary: CI: update AD_MODULE to version 32319 details: https://code.openbravo.com/erp/devel/pi/rev/5cd8c36d0974 changeset: 32322:5cd8c36d0974 user: RM packaging bot openbravo.com> date: Mon Jun 19 14:23:31 2017 + summary: CI: merge back from main diffstat: modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 4 +- modules/org.openbravo.apachejdbcconnectionpool/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.apachejdbcconnectionpool/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 2 +- modules/org.openbravo.base.weld/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.base.weld/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 2 +- modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 8 +- modules/org.openbravo.client.htmlwidget/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.client.htmlwidget/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 2 +- modules/org.openbravo.client.kernel/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.client.kernel/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 6 +- modules/org.openbravo.client.myob/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.client.myob/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 4 +- modules/org.openbravo.client.querylist/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.client.querylist/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 2 +- modules/org.openbravo.client.widgets/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.client.widgets/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 2 +- modules/org.openbravo.financial.paymentreport/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.financial.paymentreport/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 2 +- modules/org.openbravo.reports.ordersawaitingdelivery/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.reports.ordersawaitingdelivery/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 2 +- modules/org.openbravo.service.datasource/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.service.datasource/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 10 ++-- modules/org.openbravo.service.integration.google/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.service.integration.google/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 4 +- modules/org.openbravo.service.integration.openid/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.service.integration.openid/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 2 +- modules/org.openbravo.service.json/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.service.json/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 2 +- modules/org.openbravo.userinterface.selector/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.userinterface.selector/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 12 ++-- modules/org.openbravo.userinterface.skin.250to300Comp/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.userinterface.skin.250to300Comp/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 2 +- modules/org.openbravo.userinterface.smartclient/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.userinterface.smartclient/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 6 +- modules/org.openbravo.utility.cleanup.log/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.utility.cleanup.log/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 2 +-
[OpenbravoERP-commits] devel/main: 3 new changesets
details: https://code.openbravo.com/erp/devel/main/rev/1c11b256bd10 changeset: 32318:1c11b256bd10 user: RM packaging bot openbravo.com> date: Sat Jun 17 00:06:44 2017 + summary: CI: merge back from main details: https://code.openbravo.com/erp/devel/main/rev/75e216b9efe2 changeset: 32319:75e216b9efe2 user: Asier Lostalé openbravo.com> date: Mon Jun 19 10:54:05 2017 +0200 summary: fixed bug 36271: login page logs error if loaded while logging out Don't try to get/remove attributes from HttpSession if it's already invalidated. Note HttpSession API doesn't provide a method to check if its status, so only way it to catch IllegalStateException. details: https://code.openbravo.com/erp/devel/main/rev/2bb472b1616b changeset: 32320:2bb472b1616b user: RM packaging bot openbravo.com> date: Mon Jun 19 14:09:31 2017 + summary: CI: update AD_MODULE to version 32319 diffstat: modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 4 +- modules/org.openbravo.apachejdbcconnectionpool/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.apachejdbcconnectionpool/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 2 +- modules/org.openbravo.base.weld/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.base.weld/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 2 +- modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 8 +- modules/org.openbravo.client.htmlwidget/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.client.htmlwidget/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 2 +- modules/org.openbravo.client.kernel/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.client.kernel/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 6 +- modules/org.openbravo.client.myob/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.client.myob/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 4 +- modules/org.openbravo.client.querylist/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.client.querylist/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 2 +- modules/org.openbravo.client.widgets/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.client.widgets/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 2 +- modules/org.openbravo.financial.paymentreport/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.financial.paymentreport/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 2 +- modules/org.openbravo.reports.ordersawaitingdelivery/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.reports.ordersawaitingdelivery/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 2 +- modules/org.openbravo.service.datasource/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.service.datasource/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 10 +- modules/org.openbravo.service.integration.google/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.service.integration.google/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 4 +- modules/org.openbravo.service.integration.openid/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.service.integration.openid/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 2 +- modules/org.openbravo.service.json/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.service.json/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 2 +- modules/org.openbravo.userinterface.selector/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.userinterface.selector/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 12 ++-- modules/org.openbravo.userinterface.skin.250to300Comp/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.userinterface.skin.250to300Comp/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 2 +-
[OpenbravoERP-commits] devel/pi: fixed bug 36274: abandoned connection in SessionListener
details: https://code.openbravo.com/erp/devel/pi/rev/cfd3f8102b4a
changeset: 32320:cfd3f8102b4a
user: Asier Lostalé openbravo.com>
date: Mon Jun 19 15:16:26 2017 +0200
summary: fixed bug 36274: abandoned connection in SessionListener
Detach connection from current thread to allow it to be properly returned
to pool.
This is required whever the thread doing the actio is not handling an standard
request.
diffstat:
src/org/openbravo/erpCommon/security/SessionListener.java | 6 +-
1 files changed, 5 insertions(+), 1 deletions(-)
diffs (30 lines):
diff -r 75e216b9efe2 -r cfd3f8102b4a
src/org/openbravo/erpCommon/security/SessionListener.java
--- a/src/org/openbravo/erpCommon/security/SessionListener.java Mon Jun 19
10:54:05 2017 +0200
+++ b/src/org/openbravo/erpCommon/security/SessionListener.java Mon Jun 19
15:16:26 2017 +0200
@@ -91,6 +91,8 @@
}
}
SessionListener.context = null;
+// detaching db connection from thread so can it be returned to pool
+SessionInfo.init();
log.info("Sessions deactivated in " + (System.currentTimeMillis() - t) + "
ms");
}
@@ -157,7 +159,6 @@
activeHttpSessions.add(event.getSession());
}
-
if (RequestContext.get().getRequest() != null
&&
AuthenticationManager.isStatelessRequest(RequestContext.get().getRequest())) {
final String errorLog =
RequestContext.get().getRequest().getRequestURL() + " "
@@ -198,6 +199,9 @@
log.debug("Closed session" + sessionId);
} catch (Exception e) {
log.error("Error closing session:" + sessionId, e);
+} finally {
+ // detaching db connection from thread so can it be returned to pool
+ SessionInfo.init();
}
}
--
Check out the vibrant tech community on one of the world's most
engaging tech sites, Slashdot.org! http://sdm.link/slashdot
___
Openbravo-commits mailing list
Openbravo-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/openbravo-commits
[OpenbravoERP-commits] devel/pi: fixed bug 36271: login page logs error if loaded while...
details: https://code.openbravo.com/erp/devel/pi/rev/75e216b9efe2
changeset: 32319:75e216b9efe2
user: Asier Lostalé openbravo.com>
date: Mon Jun 19 10:54:05 2017 +0200
summary: fixed bug 36271: login page logs error if loaded while logging out
Don't try to get/remove attributes from HttpSession if it's already
invalidated.
Note HttpSession API doesn't provide a method to check if its status, so only
way it to catch IllegalStateException.
diffstat:
src-core/src/org/openbravo/base/VariablesBase.java | 29 ++---
1 files changed, 14 insertions(+), 15 deletions(-)
diffs (50 lines):
diff -r 1c11b256bd10 -r 75e216b9efe2
src-core/src/org/openbravo/base/VariablesBase.java
--- a/src-core/src/org/openbravo/base/VariablesBase.javaSat Jun 17
00:06:44 2017 +
+++ b/src-core/src/org/openbravo/base/VariablesBase.javaMon Jun 19
10:54:05 2017 +0200
@@ -1467,6 +1467,12 @@
session.removeAttribute(sessionName);
e = session.getAttributeNames();
}
+if (!target.equals("")) {
+ session.setAttribute("TARGET", target);
+}
+if (targetQueryString != null) {
+ session.setAttribute("TARGETQUERYSTRING", targetQueryString);
+}
} else {
for (String key : sessionAttributes.keySet()) {
if (log4j.isDebugEnabled())
@@ -1479,25 +1485,18 @@
}
}
sessionAttributes.clear();
+if (!target.equals("")) {
+ sessionAttributes.put("TARGET", target);
+}
+if (targetQueryString != null) {
+ sessionAttributes.put("TARGETQUERYSTRING", targetQueryString);
+}
}
+} catch (IllegalStateException ignored) {
+ // session is already invalidated: don't do anything
} catch (Exception e) {
log4j.error("clearSession error ", e);
}
-if (session != null) {
- if (!target.equals("")) {
-session.setAttribute("TARGET", target);
- }
- if (targetQueryString != null) {
-session.setAttribute("TARGETQUERYSTRING", targetQueryString);
- }
-} else {
- if (!target.equals("")) {
-sessionAttributes.put("TARGET", target);
- }
- if (targetQueryString != null) {
-sessionAttributes.put("TARGETQUERYSTRING", targetQueryString);
- }
-}
}
/**
--
Check out the vibrant tech community on one of the world's most
engaging tech sites, Slashdot.org! http://sdm.link/slashdot
___
Openbravo-commits mailing list
Openbravo-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/openbravo-commits
