From c6c4c65120622b1f5a1f89aefd5fe5a16a54896d Mon Sep 17 00:00:00 2001 From: Carlos Ruiz Date: Wed, 5 Sep 2012 18:55:06 -0500 Subject: [PATCH] IDEMPIERE-377 Improve current search dialog box / create the messages - fix the call to query --- .../oracle/903_IDEMPIERE-377.sql | 23 +++++++++++++++++++ .../postgresql/903_IDEMPIERE-377.sql | 23 +++++++++++++++++++ .../adempiere/webui/window/FindWindow.java | 14 +++++------ 3 files changed, 52 insertions(+), 8 deletions(-) create mode 100644 migration/360lts-release/oracle/903_IDEMPIERE-377.sql create mode 100644 migration/360lts-release/postgresql/903_IDEMPIERE-377.sql diff --git a/migration/360lts-release/oracle/903_IDEMPIERE-377.sql b/migration/360lts-release/oracle/903_IDEMPIERE-377.sql new file mode 100644 index 0000000000..de9d111cf7 --- /dev/null +++ b/migration/360lts-release/oracle/903_IDEMPIERE-377.sql @@ -0,0 +1,23 @@ +-- Sep 5, 2012 6:21:41 PM COT +-- IDEMPIERE-377 Improve current search dialog box +INSERT INTO AD_Message (MsgType,MsgText,AD_Message_ID,EntityType,AD_Message_UU,Value,IsActive,Updated,CreatedBy,UpdatedBy,AD_Client_ID,AD_Org_ID,Created) VALUES ('I','Name is required',200035,'D','303c9cf1-6159-4b47-82ff-9d10eed69845','NeedsName','Y',TO_DATE('2012-09-05 18:21:40','YYYY-MM-DD HH24:MI:SS'),100,100,0,0,TO_DATE('2012-09-05 18:21:40','YYYY-MM-DD HH24:MI:SS')) +; + +-- Sep 5, 2012 6:21:41 PM COT +-- IDEMPIERE-377 Improve current search dialog box +INSERT INTO AD_Message_Trl (AD_Language,AD_Message_ID, MsgText,MsgTip, IsTranslated,AD_Client_ID,AD_Org_ID,Created,Createdby,Updated,UpdatedBy,AD_Message_Trl_UU ) SELECT l.AD_Language,t.AD_Message_ID, t.MsgText,t.MsgTip, 'N',t.AD_Client_ID,t.AD_Org_ID,t.Created,t.Createdby,t.Updated,t.UpdatedBy,Generate_UUID() FROM AD_Language l, AD_Message t WHERE l.IsActive='Y' AND l.IsSystemLanguage='Y' AND l.IsBaseLanguage='N' AND t.AD_Message_ID=200035 AND NOT EXISTS (SELECT * FROM AD_Message_Trl tt WHERE tt.AD_Language=l.AD_Language AND tt.AD_Message_ID=t.AD_Message_ID) +; + +-- Sep 5, 2012 6:22:20 PM COT +-- IDEMPIERE-377 Improve current search dialog box +INSERT INTO AD_Message (MsgType,MsgText,AD_Message_ID,EntityType,AD_Message_UU,Value,IsActive,Updated,CreatedBy,UpdatedBy,AD_Client_ID,AD_Org_ID,Created) VALUES ('I','New Query',200036,'D','b12c3245-60f6-4da7-aa47-793370395735','New Query','Y',TO_DATE('2012-09-05 18:22:20','YYYY-MM-DD HH24:MI:SS'),100,100,0,0,TO_DATE('2012-09-05 18:22:20','YYYY-MM-DD HH24:MI:SS')) +; + +-- Sep 5, 2012 6:22:20 PM COT +-- IDEMPIERE-377 Improve current search dialog box +INSERT INTO AD_Message_Trl (AD_Language,AD_Message_ID, MsgText,MsgTip, IsTranslated,AD_Client_ID,AD_Org_ID,Created,Createdby,Updated,UpdatedBy,AD_Message_Trl_UU ) SELECT l.AD_Language,t.AD_Message_ID, t.MsgText,t.MsgTip, 'N',t.AD_Client_ID,t.AD_Org_ID,t.Created,t.Createdby,t.Updated,t.UpdatedBy,Generate_UUID() FROM AD_Language l, AD_Message t WHERE l.IsActive='Y' AND l.IsSystemLanguage='Y' AND l.IsBaseLanguage='N' AND t.AD_Message_ID=200036 AND NOT EXISTS (SELECT * FROM AD_Message_Trl tt WHERE tt.AD_Language=l.AD_Language AND tt.AD_Message_ID=t.AD_Message_ID) +; + +SELECT register_migration_script('903_IDEMPIERE-377.sql') FROM dual +; + diff --git a/migration/360lts-release/postgresql/903_IDEMPIERE-377.sql b/migration/360lts-release/postgresql/903_IDEMPIERE-377.sql new file mode 100644 index 0000000000..7f95358d1f --- /dev/null +++ b/migration/360lts-release/postgresql/903_IDEMPIERE-377.sql @@ -0,0 +1,23 @@ +-- Sep 5, 2012 6:21:41 PM COT +-- IDEMPIERE-377 Improve current search dialog box +INSERT INTO AD_Message (MsgType,MsgText,AD_Message_ID,EntityType,AD_Message_UU,Value,IsActive,Updated,CreatedBy,UpdatedBy,AD_Client_ID,AD_Org_ID,Created) VALUES ('I','Name is required',200035,'D','303c9cf1-6159-4b47-82ff-9d10eed69845','NeedsName','Y',TO_TIMESTAMP('2012-09-05 18:21:40','YYYY-MM-DD HH24:MI:SS'),100,100,0,0,TO_TIMESTAMP('2012-09-05 18:21:40','YYYY-MM-DD HH24:MI:SS')) +; + +-- Sep 5, 2012 6:21:41 PM COT +-- IDEMPIERE-377 Improve current search dialog box +INSERT INTO AD_Message_Trl (AD_Language,AD_Message_ID, MsgText,MsgTip, IsTranslated,AD_Client_ID,AD_Org_ID,Created,Createdby,Updated,UpdatedBy,AD_Message_Trl_UU ) SELECT l.AD_Language,t.AD_Message_ID, t.MsgText,t.MsgTip, 'N',t.AD_Client_ID,t.AD_Org_ID,t.Created,t.Createdby,t.Updated,t.UpdatedBy,Generate_UUID() FROM AD_Language l, AD_Message t WHERE l.IsActive='Y' AND l.IsSystemLanguage='Y' AND l.IsBaseLanguage='N' AND t.AD_Message_ID=200035 AND NOT EXISTS (SELECT * FROM AD_Message_Trl tt WHERE tt.AD_Language=l.AD_Language AND tt.AD_Message_ID=t.AD_Message_ID) +; + +-- Sep 5, 2012 6:22:20 PM COT +-- IDEMPIERE-377 Improve current search dialog box +INSERT INTO AD_Message (MsgType,MsgText,AD_Message_ID,EntityType,AD_Message_UU,Value,IsActive,Updated,CreatedBy,UpdatedBy,AD_Client_ID,AD_Org_ID,Created) VALUES ('I','New Query',200036,'D','b12c3245-60f6-4da7-aa47-793370395735','New Query','Y',TO_TIMESTAMP('2012-09-05 18:22:20','YYYY-MM-DD HH24:MI:SS'),100,100,0,0,TO_TIMESTAMP('2012-09-05 18:22:20','YYYY-MM-DD HH24:MI:SS')) +; + +-- Sep 5, 2012 6:22:20 PM COT +-- IDEMPIERE-377 Improve current search dialog box +INSERT INTO AD_Message_Trl (AD_Language,AD_Message_ID, MsgText,MsgTip, IsTranslated,AD_Client_ID,AD_Org_ID,Created,Createdby,Updated,UpdatedBy,AD_Message_Trl_UU ) SELECT l.AD_Language,t.AD_Message_ID, t.MsgText,t.MsgTip, 'N',t.AD_Client_ID,t.AD_Org_ID,t.Created,t.Createdby,t.Updated,t.UpdatedBy,Generate_UUID() FROM AD_Language l, AD_Message t WHERE l.IsActive='Y' AND l.IsSystemLanguage='Y' AND l.IsBaseLanguage='N' AND t.AD_Message_ID=200036 AND NOT EXISTS (SELECT * FROM AD_Message_Trl tt WHERE tt.AD_Language=l.AD_Language AND tt.AD_Message_ID=t.AD_Message_ID) +; + +SELECT register_migration_script('903_IDEMPIERE-377.sql') FROM dual +; + diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/FindWindow.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/FindWindow.java index c677f7e77a..b7bac58731 100644 --- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/FindWindow.java +++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/FindWindow.java @@ -111,8 +111,8 @@ public class FindWindow extends Window implements EventListener, ValueCha /** * */ - private static final long serialVersionUID = -5352467965724233821L; - + private static final long serialVersionUID = 2452116093966974927L; + // values and label for history combo private static final String HISTORY_DAY_ALL = "All"; private static final String HISTORY_DAY_YEAR = "Year"; @@ -1341,7 +1341,7 @@ public class FindWindow extends Window implements EventListener, ValueCha if(Operator.equals(MQuery.NULL) || Operator.equals(MQuery.NOT_NULL)) { m_query.addRestriction(ColumnSQL, Operator, null, - infoName, null); + infoName, null, and, openBrackets); if (code.length() > 0) code.append(SEGMENT_SEPARATOR); code.append(ColumnName) @@ -1381,19 +1381,17 @@ public class FindWindow extends Window implements EventListener, ValueCha if (parsedValue2 == null) continue; m_query.addRangeRestriction(ColumnSQL, parsedValue, parsedValue2, - infoName, infoDisplay, infoDisplay_to); + infoName, infoDisplay, infoDisplay_to, and, openBrackets); } else if (isProductCategoryField && MQuery.OPERATORS[MQuery.EQUAL_INDEX].equals(op)) { if (!(parsedValue instanceof Integer)) { continue; } - m_query - - .addRestriction(getSubCategoryWhereClause(((Integer) parsedValue).intValue())); + m_query.addRestriction(getSubCategoryWhereClause(((Integer) parsedValue).intValue()), and, openBrackets); } else m_query.addRestriction(ColumnSQL, Operator, parsedValue, - infoName, infoDisplay); + infoName, infoDisplay, and, openBrackets); if (code.length() > 0) code.append(SEGMENT_SEPARATOR);