details: /erp/devel/pi/rev/b306a39bc658
changeset: 12503:b306a39bc658
user: Antonio Moreno <antonio.moreno <at> openbravo.com>
date: Thu May 26 17:13:43 2011 +0100
summary: Fixed issue 16670. Inactive organizations will not be listed on the
user profile widget
diffstat:
modules/org.openbravo.client.application/src/org/openbravo/client/application/navigationbarcomponents/UserInfoWidgetActionHandler.java
| 8 +++++---
1 files changed, 5 insertions(+), 3 deletions(-)
diffs (25 lines):
diff -r bd318e85c8ed -r b306a39bc658
modules/org.openbravo.client.application/src/org/openbravo/client/application/navigationbarcomponents/UserInfoWidgetActionHandler.java
---
a/modules/org.openbravo.client.application/src/org/openbravo/client/application/navigationbarcomponents/UserInfoWidgetActionHandler.java
Thu May 26 17:54:59 2011 +0200
+++
b/modules/org.openbravo.client.application/src/org/openbravo/client/application/navigationbarcomponents/UserInfoWidgetActionHandler.java
Thu May 26 17:13:43 2011 +0100
@@ -197,8 +197,10 @@
for (Organization org : orgs.list()) {
JSONObject orgWarehouse = new JSONObject();
orgWarehouse.put("orgId", org.getId());
- final OBQuery<Warehouse> warehouses =
OBDal.getInstance().createQuery(Warehouse.class,
- "organization.id in (:orgList) and client.id=:clientId order by
name");
+ final OBQuery<Warehouse> warehouses = OBDal
+ .getInstance()
+ .createQuery(Warehouse.class,
+ "organization.id in (:orgList) and client.id=:clientId and
organization.active=true order by name");
warehouses.setNamedParameter("orgList", osp.getNaturalTree(org.getId()));
warehouses.setNamedParameter("clientId", clientId);
warehouses.setFilterOnReadableClients(false);
@@ -211,7 +213,7 @@
private List<Organization> getOrganizations(String roleId) throws
JSONException {
final OBQuery<RoleOrganization> roleOrgs = OBDal.getInstance().createQuery(
- RoleOrganization.class, "role.id=:roleId");
+ RoleOrganization.class, "role.id=:roleId and active=true");
roleOrgs.setFilterOnReadableClients(false);
roleOrgs.setFilterOnReadableOrganization(false);
roleOrgs.setNamedParameter("roleId", roleId);
------------------------------------------------------------------------------
vRanger cuts backup time in half-while increasing security.
With the market-leading solution for virtual backup and recovery,
you get blazing-fast, flexible, and affordable data protection.
Download your free trial now.
http://p.sf.net/sfu/quest-d2dcopy1
_______________________________________________
Openbravo-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/openbravo-commits
