details: https://code.openbravo.com/erp/devel/pi/rev/7624afcf30fb
changeset: 15944:7624afcf30fb
user: Asier Lostalé <asier.lostale <at> openbravo.com>
date: Thu Mar 29 16:00:11 2012 +0200
summary: fixed bug 20153: Incorrect linked items to inaccessible windows
diffstat:
src/org/openbravo/erpCommon/utility/UsedByLink.java | 5 +++--
src/org/openbravo/erpCommon/utility/UsedByLink_data.xsql | 1 +
2 files changed, 4 insertions(+), 2 deletions(-)
diffs (33 lines):
diff -r 8bac1304f99c -r 7624afcf30fb
src/org/openbravo/erpCommon/utility/UsedByLink.java
--- a/src/org/openbravo/erpCommon/utility/UsedByLink.java Thu Mar 29
14:24:33 2012 +0200
+++ b/src/org/openbravo/erpCommon/utility/UsedByLink.java Thu Mar 29
16:00:11 2012 +0200
@@ -363,7 +363,6 @@
strNonAccessibleWhere).equals("0")) {
nonAccessible = true;
}
-
}
strWhereClause += " AND AD_ORG_ID IN (" + vars.getUserOrg() + ") AND
AD_CLIENT_ID IN ("
+ vars.getUserClient() + ")";
@@ -528,7 +527,9 @@
}
jsonObject.put("usedByLinkData", usedByLinkDataJsonObjects);
- jsonObject.put("msg", msg);
+ if (msg != null) {
+ jsonObject.put("msg", msg.getMessage());
+ }
return jsonObject;
}
diff -r 8bac1304f99c -r 7624afcf30fb
src/org/openbravo/erpCommon/utility/UsedByLink_data.xsql
--- a/src/org/openbravo/erpCommon/utility/UsedByLink_data.xsql Thu Mar 29
14:24:33 2012 +0200
+++ b/src/org/openbravo/erpCommon/utility/UsedByLink_data.xsql Thu Mar 29
16:00:11 2012 +0200
@@ -38,6 +38,7 @@
(CASE WHEN (SELECT COUNT(*)
FROM AD_WINDOW_ACCESS WA
WHERE W.AD_WINDOW_ID = WA.AD_WINDOW_ID
+ AND WA.ISACTIVE = 'Y'
AND WA.AD_ROLE_ID = ?)=0 THEN 'N'
ELSE 'Y'
END) AS ACCESSIBLE,
------------------------------------------------------------------------------
This SF email is sponsosred by:
Try Windows Azure free for 90 days Click Here
http://p.sf.net/sfu/sfd2d-msazure
_______________________________________________
Openbravo-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/openbravo-commits
