0016611: Initial request done by UI selector element in form view does not use any filters or paging

# HG changeset patch
# Parent 2f1f713661c396b4fbc52bc6124d9ef9a9129bf1
re issue 16611: Fix initial filter when using custom query within selector

diff --git a/modules/org.openbravo.userinterface.selector/src/org/openbravo/userinterface/selector/CustomQuerySelectorDatasource.java b/modules/org.openbravo.userinterface.selector/src/org/openbravo/userinterface/selector/CustomQuerySelectorDatasource.java
--- a/modules/org.openbravo.userinterface.selector/src/org/openbravo/userinterface/selector/CustomQuerySelectorDatasource.java
+++ b/modules/org.openbravo.userinterface.selector/src/org/openbravo/userinterface/selector/CustomQuerySelectorDatasource.java
@@ -180,6 +180,7 @@
 
     StringBuffer defaultExpressionsFilter = new StringBuffer();
     boolean hasFilter = false;
+    String valueFilter = null;
     List<SelectorField> fields = OBDao.getActiveOBObjectList(sel,
         Selector.PROPERTY_OBUISELSELECTORFIELDLIST);
     HashMap<String, String> criteria = getCriteria(parameters);
@@ -227,10 +228,16 @@
           }
         }
         additionalFilter.append(whereClause);
+      } else if (field == sel.getValuefield() && value != null ) {
+        // Handle special case we are trying to retrieve a particular object.
+        String whereClause = getWhereClause(value, field, xmlDateFormat);
+        valueFilter = NEW_FILTER_CLAUSE + " (" + whereClause +")";
       }
     }
     if (hasFilter) {
       additionalFilter.append(")");
+    } else if( valueFilter != null ) {
+      additionalFilter.append(valueFilter);
     }
     if (defaultExpressionsFilter.length() > 0) {
       additionalFilter.append(defaultExpressionsFilter);

# HG changeset patch
# Parent 9c881e0eb9bbaee0d09c76d0aae79dad78f6aade
re issue 16611: Fix initial filter when using custom query within selector

diff --git a/modules/org.openbravo.userinterface.selector/src-db/database/sourcedata/AD_FIELD.xml b/modules/org.openbravo.userinterface.selector/src-db/database/sourcedata/AD_FIELD.xml
--- a/modules/org.openbravo.userinterface.selector/src-db/database/sourcedata/AD_FIELD.xml
+++ b/modules/org.openbravo.userinterface.selector/src-db/database/sourcedata/AD_FIELD.xml
@@ -1099,7 +1099,7 @@
 <!--9A5A29111530107DE040007F01002F6B-->  <AD_TAB_ID><![CDATA[75FEAE3FF26F49E394BDF833B1B97647]]></AD_TAB_ID>
 <!--9A5A29111530107DE040007F01002F6B-->  <AD_COLUMN_ID><![CDATA[9A597DDF995CE963E040007F01002F75]]></AD_COLUMN_ID>
 <!--9A5A29111530107DE040007F01002F6B-->  <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED>
-<!--9A5A29111530107DE040007F01002F6B-->  <DISPLAYLOGIC><![CDATA[@showingrid@='Y'&@custom_query@='Y']]></DISPLAYLOGIC>
+<!--9A5A29111530107DE040007F01002F6B-->  <DISPLAYLOGIC><![CDATA[@custom_query@='Y']]></DISPLAYLOGIC>
 <!--9A5A29111530107DE040007F01002F6B-->  <DISPLAYLENGTH><![CDATA[255]]></DISPLAYLENGTH>
 <!--9A5A29111530107DE040007F01002F6B-->  <ISREADONLY><![CDATA[N]]></ISREADONLY>
 <!--9A5A29111530107DE040007F01002F6B-->  <SEQNO><![CDATA[162]]></SEQNO>
diff --git a/modules/org.openbravo.userinterface.selector/src/org/openbravo/userinterface/selector/CustomQuerySelectorDatasource.java b/modules/org.openbravo.userinterface.selector/src/org/openbravo/userinterface/selector/CustomQuerySelectorDatasource.java
--- a/modules/org.openbravo.userinterface.selector/src/org/openbravo/userinterface/selector/CustomQuerySelectorDatasource.java
+++ b/modules/org.openbravo.userinterface.selector/src/org/openbravo/userinterface/selector/CustomQuerySelectorDatasource.java
@@ -181,6 +181,7 @@
 
     StringBuffer defaultExpressionsFilter = new StringBuffer();
     boolean hasFilter = false;
+    String valueFilter = null;
     List<SelectorField> fields = OBDao.getActiveOBObjectList(sel,
         Selector.PROPERTY_OBUISELSELECTORFIELDLIST);
     HashMap<String, String> criteria = getCriteria(parameters);
@@ -228,10 +229,16 @@
           }
         }
         additionalFilter.append(whereClause);
+      } else if (field == sel.getValuefield() && value != null ) {
+        // Handle special case we are trying to retrieve a particular object.
+        String whereClause = getWhereClause(value, field, xmlDateFormat);
+        valueFilter = NEW_FILTER_CLAUSE + " (" + whereClause +")";
       }
     }
     if (hasFilter) {
       additionalFilter.append(")");
+    } else if( valueFilter != null ) {
+      additionalFilter.append(valueFilter);
     }
     if (defaultExpressionsFilter.length() > 0) {
       additionalFilter.append(defaultExpressionsFilter);
diff --git a/src-db/database/sourcedata/OBUISEL_SELECTOR_FIELD.xml b/src-db/database/sourcedata/OBUISEL_SELECTOR_FIELD.xml
--- a/src-db/database/sourcedata/OBUISEL_SELECTOR_FIELD.xml
+++ b/src-db/database/sourcedata/OBUISEL_SELECTOR_FIELD.xml
@@ -562,6 +562,7 @@
 <!--B103893820FC4080809A97FABD49D8AF-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--B103893820FC4080809A97FABD49D8AF-->  <ISOUTFIELD><![CDATA[Y]]></ISOUTFIELD>
 <!--B103893820FC4080809A97FABD49D8AF-->  <DISPLAY_EXPRESSION><![CDATA[bpid]]></DISPLAY_EXPRESSION>
+<!--B103893820FC4080809A97FABD49D8AF-->  <CLAUSE_LEFT_PART><![CDATA[bp.id]]></CLAUSE_LEFT_PART>
 <!--B103893820FC4080809A97FABD49D8AF-->  <AD_REFERENCE_ID><![CDATA[13]]></AD_REFERENCE_ID>
 <!--B103893820FC4080809A97FABD49D8AF-->  <SHOWINPICKLIST><![CDATA[N]]></SHOWINPICKLIST>
 <!--B103893820FC4080809A97FABD49D8AF--></OBUISEL_SELECTOR_FIELD>

# HG changeset patch
# Parent 58d76d9e22cebc99e5ce4a704d0ede01e082a7c1
fixes 16611 - Add check in DefaultJsonDataService for id set on target property & retreive single object when that is set

diff --git a/modules/org.openbravo.service.json/src/org/openbravo/service/json/DefaultJsonDataService.java b/modules/org.openbravo.service.json/src/org/openbravo/service/json/DefaultJsonDataService.java
--- a/modules/org.openbravo.service.json/src/org/openbravo/service/json/DefaultJsonDataService.java
+++ b/modules/org.openbravo.service.json/src/org/openbravo/service/json/DefaultJsonDataService.java
@@ -77,7 +77,13 @@
       final JSONObject jsonResult = new JSONObject();
       final JSONObject jsonResponse = new JSONObject();
       List<BaseOBObject> bobs;
-      final String id = parameters.get(JsonConstants.ID);
+      String id = parameters.get(JsonConstants.ID);
+      if( id == null && parameters.containsKey(JsonConstants.TARGET_PROPERTY)) {
+        final String targetId = parameters.get(JsonConstants.TARGET_PROPERTY) + "." + JsonConstants.ID;
+        if(parameters.containsKey(targetId)) {
+          id = parameters.get(targetId);
+        }
+      }
       // if the id is set that's a special case of one object being requested
       if (id != null) {
         bobs = new ArrayList<BaseOBObject>();
diff --git a/modules/org.openbravo.service.json/src/org/openbravo/service/json/JsonConstants.java b/modules/org.openbravo.service.json/src/org/openbravo/service/json/JsonConstants.java
--- a/modules/org.openbravo.service.json/src/org/openbravo/service/json/JsonConstants.java
+++ b/modules/org.openbravo.service.json/src/org/openbravo/service/json/JsonConstants.java
@@ -105,6 +105,7 @@
   public static final String ACTIVE = "active";
   public static final String DATA = "data";
   public static final String NEW_INDICATOR = "_new";
+  public static final String TARGET_PROPERTY = "targetProperty";
 
   public static final String IN_PARAMETER_SEPARATOR = "__;__";