midsuit
/
core-jgi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

IDEMPIERE-600 Use User Org Access in Role didn't work - thanks to Juliana Corredor

This commit is contained in:
Carlos Ruiz 2013-02-06 08:26:39 -05:00
parent c0870adfa9
commit 6b50b40a42
1 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
org.adempiere.base/src/org/compiere/util/Login.java
View File

@ -532,12 +532,9 @@ public class Login
// //
String sql = " SELECT DISTINCT r.UserLevel, r.ConnectionProfile,o.AD_Org_ID,o.Name,o.IsSummary " String sql = " SELECT DISTINCT r.UserLevel, r.ConnectionProfile,o.AD_Org_ID,o.Name,o.IsSummary "
+" FROM AD_Org o" +" FROM AD_Org o"
+" INNER JOIN AD_Role_OrgAccess ra ON (ra.AD_Org_ID=o.AD_Org_ID)" +" INNER JOIN AD_Role r on (r.AD_Role_ID=?)"
+" INNER JOIN AD_Role r on (ra.AD_Role_ID=r.AD_Role_ID) " +" INNER JOIN AD_Client c on (c.AD_Client_ID=?)"
+" INNER JOIN AD_Client c on (ra.AD_Client_ID=c.AD_Client_ID)" +" WHERE o.IsActive='Y' "
+" WHERE r.AD_Role_ID=?"
+" AND c.AD_Client_ID=?"
+" AND o.IsActive='Y' "
+" AND o.IsSummary='N'" +" AND o.IsSummary='N'"
+" AND (r.IsAccessAllOrgs='Y'" +" AND (r.IsAccessAllOrgs='Y'"
+" OR (r.IsUseUserOrgAccess='N' AND o.AD_Org_ID IN (SELECT AD_Org_ID FROM AD_Role_OrgAccess ra" +" OR (r.IsUseUserOrgAccess='N' AND o.AD_Org_ID IN (SELECT AD_Org_ID FROM AD_Role_OrgAccess ra"