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

IDEMPIERE-177 

Corrected selection process
This commit is contained in:
Dirk Niemeyer 2012-03-06 11:10:20 +01:00
parent 211d2f67b0
commit f34782257d
1 changed files with 27 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
org.adempiere.base/src/org/compiere/model/MUserDefWin.java
View File

@ -133,15 +133,31 @@ public class MUserDefWin extends X_AD_UserDef_Win
// any user + this role + any org => weight = 2 // any user + this role + any org => weight = 2
// any user + any role + this org => weight = 1 // any user + any role + this org => weight = 1
// any user + any role + any org => weight = 0 // any user + any role + any org => weight = 0
// other user or other role or other org => weight = -1 and thus ruled out
for (int i=0; i < size; i++) for (int i=0; i < size; i++)
{ {
weight[i] = 0; weight[i] = 0;
if (candidates[i].getAD_User_ID() == AD_User_ID) if (candidates[i].getAD_User_ID() > 0) {
if (candidates[i].getAD_User_ID() == AD_User_ID) {
weight[i] = weight[i] + 4; weight[i] = weight[i] + 4;
if (candidates[i].getAD_Role_ID() == AD_Role_ID) } else {
weight[i] = -1;
}
}
if (weight[i] > -1 && candidates[i].getAD_Role_ID() > 0) {
if (candidates[i].getAD_Role_ID() == AD_Role_ID) {
weight[i] = weight[i] + 2; weight[i] = weight[i] + 2;
if (candidates[i].getAD_Org_ID() == AD_Org_ID) } else {
weight[i] = -1;
}
}
if (weight[i] > -1 && candidates[i].getAD_Org_ID() > 0) {
if (candidates[i].getAD_Org_ID() == AD_Org_ID) {
weight[i] = weight[i] + 1; weight[i] = weight[i] + 1;
} else {
weight[i] = -1;
}
}
// others are implicit // others are implicit
} }
@ -154,7 +170,11 @@ public class MUserDefWin extends X_AD_UserDef_Win
} }
} }
if (weight[maxindex] > -1) {
return candidates[maxindex]; return candidates[maxindex];
} else {
return null;
}
} }
} // MUserDefWin } // MUserDefWin