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

IDEMPIERE-3340 Fix cross tenant in Favourites (#1426)

This commit is contained in:
Carlos Ruiz 2022-08-05 00:11:06 +02:00 committed by GitHub
parent 1fcbd5ea07
commit 9b812a315f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
org.adempiere.base/src/org/compiere/model/MTreeFavorite.java
View File

@ -38,7 +38,7 @@ public class MTreeFavorite extends X_AD_Tree_Favorite
public static final String SQL_GET_TREE_FAVORITE_ID = "SELECT AD_Tree_Favorite_ID FROM AD_Tree_Favorite WHERE IsActive='Y' AND AD_User_ID=?"; public static final String SQL_GET_TREE_FAVORITE_ID = "SELECT AD_Tree_Favorite_ID FROM AD_Tree_Favorite WHERE IsActive='Y' AND AD_User_ID=?";
public static final String SQL_GET_TREE_FAVORITE_NODE = "SELECT AD_Tree_Favorite_Node_ID, Parent_ID, SeqNo, Name, IsSummary, AD_Menu_ID, IsCollapsible, IsFavourite " public static final String SQL_GET_TREE_FAVORITE_NODE = "SELECT AD_Tree_Favorite_Node_ID, Parent_ID, SeqNo, Name, IsSummary, AD_Menu_ID, IsCollapsible, IsFavourite "
+ " FROM AD_Tree_Favorite_Node WHERE IsActive='Y' AND AD_Tree_Favorite_ID=? " + " FROM AD_Tree_Favorite_Node WHERE IsActive='Y' AND AD_Tree_Favorite_ID=? AND AD_Client_ID IN (0,?) "
+ " ORDER BY COALESCE(Parent_ID, -1), SeqNo, Name "; + " ORDER BY COALESCE(Parent_ID, -1), SeqNo, Name ";
/** Cache for AD_Tree_Favorite_ID */ /** Cache for AD_Tree_Favorite_ID */
@ -91,6 +91,7 @@ public class MTreeFavorite extends X_AD_Tree_Favorite
pstmt = DB.prepareStatement(SQL_GET_TREE_FAVORITE_NODE, get_TrxName()); pstmt = DB.prepareStatement(SQL_GET_TREE_FAVORITE_NODE, get_TrxName());
pstmt.setInt(1, getAD_Tree_Favorite_ID()); pstmt.setInt(1, getAD_Tree_Favorite_ID());
pstmt.setInt(2, Env.getAD_Client_ID(Env.getCtx()));
rs = pstmt.executeQuery(); rs = pstmt.executeQuery();
while (rs.next()) while (rs.next())
{ {