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

IDEMPIERE-3600 The ProductInfo Toolbar button can not be accessed through master roles

This commit is contained in:
Carlos Ruiz 2018-01-10 14:42:32 +01:00
parent a384c3f0ed
commit cf4bec058f
1 changed files with 19 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
org.adempiere.base/src/org/compiere/model/MRole.java
View File

@ -3174,9 +3174,26 @@ public final class MRole extends X_AD_Role
+ "WHERE AD_Table_ID = ? " + "WHERE AD_Table_ID = ? "
+ " AND iw.IsActive = 'Y' " + " AND iw.IsActive = 'Y' "
+ " AND iwa.IsActive = 'Y' " + " AND iwa.IsActive = 'Y' "
+ " AND iwa.AD_Role_ID = ?"; + " AND (iwa.AD_Role_ID = ? OR iwa.AD_Role_ID IN"
int cnt = DB.getSQLValueEx(null, sql, I_M_Product.Table_ID, getAD_Role_ID()); + " (SELECT ri.Included_Role_ID FROM AD_Role_Included ri WHERE ri.IsActive='Y' AND ri.AD_Role_ID=?))";
int cnt = DB.getSQLValueEx(get_TrxName(), sql, I_M_Product.Table_ID, getAD_Role_ID(), getAD_Role_ID());
m_canAccess_Info_Product = new Boolean(cnt > 0); m_canAccess_Info_Product = new Boolean(cnt > 0);
// Verify if is excluded in the specific role (it can be allowed in included role and inactive in specific role)
if (m_canAccess_Info_Product) {
String sqlInactive = ""
+ "SELECT COUNT(*) "
+ "FROM AD_InfoWindow iw "
+ " JOIN AD_InfoWindow_Access iwa "
+ " ON ( iwa.AD_InfoWindow_ID = iw.AD_InfoWindow_ID ) "
+ "WHERE AD_Table_ID = ? "
+ " AND iw.IsActive = 'Y' "
+ " AND iwa.IsActive = 'N' "
+ " AND iwa.AD_Role_ID = ?";
int cntInactive = DB.getSQLValueEx(get_TrxName(), sqlInactive, I_M_Product.Table_ID, getAD_Role_ID());
if (cntInactive > 0)
m_canAccess_Info_Product = new Boolean(false);
}
} }
return m_canAccess_Info_Product.booleanValue(); return m_canAccess_Info_Product.booleanValue();
} }