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

IDEMPIERE-2342 SearchDefinition - query : could show record of other tenants / IDEMPIERE-2095

This commit is contained in:
Carlos Ruiz 2014-12-03 09:41:42 -05:00
parent b0579e009c
commit 49a1e31daa
3 changed files with 26 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
migration/i2.1/oracle/201412030938_IDEMPIERE-2342.sql Normal file
View File

@ -0,0 +1,14 @@
SET SQLBLANKLINES ON
SET DEFINE OFF
-- Dec 3, 2014 9:38:10 AM COT
-- IDEMPIERE-2342 SearchDefinition - query : could show record of other tenants
UPDATE AD_SearchDefinition SET Query='SELECT b.C_BPartner_ID FROM C_BPartner b
INNER JOIN AD_User u ON (b.C_BPartner_ID = u.C_BPartner_ID)
WHERE (UPPER(b.name) LIKE UPPER(?) OR UPPER(u.name) LIKE UPPER(?))
AND b.AD_Client_ID=@#AD_Client_ID@',Updated=TO_DATE('2014-12-03 09:38:10','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_SearchDefinition_ID=50001
;
SELECT register_migration_script('201412030938_IDEMPIERE-2342.sql') FROM dual
;

11
migration/i2.1/postgresql/201412030938_IDEMPIERE-2342.sql Normal file
View File

@ -0,0 +1,11 @@
-- Dec 3, 2014 9:38:10 AM COT
-- IDEMPIERE-2342 SearchDefinition - query : could show record of other tenants
UPDATE AD_SearchDefinition SET Query='SELECT b.C_BPartner_ID FROM C_BPartner b
INNER JOIN AD_User u ON (b.C_BPartner_ID = u.C_BPartner_ID)
WHERE (UPPER(b.name) LIKE UPPER(?) OR UPPER(u.name) LIKE UPPER(?))
AND b.AD_Client_ID=@#AD_Client_ID@',Updated=TO_TIMESTAMP('2014-12-03 09:38:10','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_SearchDefinition_ID=50001
;
SELECT register_migration_script('201412030938_IDEMPIERE-2342.sql') FROM dual
;

2
org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/DocumentSearchController.java
View File

@ -144,7 +144,7 @@ public class DocumentSearchController implements EventListener<Event>{
} else { } else {
sql.append("WHERE UPPER(").append(column.getColumnName()).append(") LIKE UPPER(?)"); sql.append("WHERE UPPER(").append(column.getColumnName()).append(") LIKE UPPER(?)");
} }
sql.append(" AND AD_Client_ID=@AD_Client_ID@ "); sql.append(" AND AD_Client_ID=@#AD_Client_ID@ ");
// search for a Integer // search for a Integer
if (msd.getDataType().equals(MSearchDefinition.DATATYPE_INTEGER)) { if (msd.getDataType().equals(MSearchDefinition.DATATYPE_INTEGER)) {