app/data: fixed search for groups, brands and categories

data/ui_panel_detail_search.json

@@ -41,20 +41,28 @@
           "type": "input",
           "direct": {"id":"select_brand", "className": "translate"},
           "attributes": {"data-enhanced":"true", "data-inset": false, "data-i18n": "[placeholder]global_dict.filter", "data-icon":"search", "data-action-btn":"true", "data-type":"search", "type":"search"},
-            "logic":{"clear":"true", "action":"search", "add_label": false}
+            "logic":{"clear":"true", "add_label": false}
+          }, {
+            "type": "input",
+            "direct": {"className": "action translate"},
+            "attributes": {"type": "submit", "data-column": "brand_id", "data-i18n": "[value]global_dict.search_brands", "data-action": "custom_checkbox_search"},
+            "logic": {"wrapper_class_list": " skim_button ui-btn-icon-right ui-icon-search "}
           }, {
             "portal_type_source": "Portal Category",
             "portal_type_title": "category",
-            "initial_query": {"query": "reference: 'sub_websection'", "include_docs": true, "select_list": ["title", "title_i18n"]},
-            "property_dict": {
-              "check": true
-            },
+            "initial_query": {"query": "reference: 'sub_websection'", "include_docs": true, "select_list": ["_id", "title", "title_i18n"]},
+            "property_dict": {},
             "scheme": [
               {
                 "position": "center",
                 "field_list": [
                   {"field": "title"}
                 ]
+              }, {
+                "position": "right",
+                "field_list": [
+                  {"field": "_id", "setKey": "id", "type": "check"}
+                ]
               }
             ],
             "children": [{
@@ -84,20 +92,28 @@
         "type": "input",
         "direct": {"id":"select_category", "className": "translate"},
         "attributes": {"data-enhanced":"true", "data-inset": false, "data-i18n": "[placeholder]global_dict.filter", "data-icon":"search", "data-action-btn":"true", "data-type":"search", "type":"search"},
-          "logic":{"clear":"true", "action":"search", "add_label": false}
+          "logic":{"clear":"true", "add_label": false}
+        }, {
+          "type": "input",
+          "direct": {"className": "action translate"},
+          "attributes": {"type": "submit", "data-column": "category", "data-i18n": "[value]global_dict.search_categories", "data-action": "custom_checkbox_search"},
+          "logic": {"wrapper_class_list": " skim_button ui-btn-icon-right ui-icon-search "}
         }, {
           "portal_type_source": "Portal Category",
           "portal_type_title": "category",
-          "initial_query": {"query": "reference: 'product_category'", "include_docs": true, "select_list": ["title", "title_i18n"]},
-          "property_dict": {
-            "check": true
-          },
+          "initial_query": {"query": "reference: 'product_category'", "include_docs": true, "select_list": ["_id", "title", "title_i18n"]},
+          "property_dict": {},
           "scheme": [
             {
               "position": "center",
               "field_list": [
                 {"field": "title"}
               ]
+            }, {
+              "position": "right",
+              "field_list": [
+                {"field": "_id", "setKey": "id", "type": "check"}
+              ]
             }
           ],
           "children": [{

data/ui_panel_groups.json

@@ -49,7 +49,7 @@
       "children": [{
         "type": "input",
         "direct": {"className": "action translate"},
-        "attributes": {"type": "submit", "data-i18n": "[value]global_dict.search_categories", "data-action": "custom_checkbox_search"},
+        "attributes": {"type": "submit", "data-column": "group", "data-i18n": "[value]global_dict.search_categories", "data-action": "custom_checkbox_search"},
         "logic": {"wrapper_class_list": " skim_button ui-btn-icon-right ui-icon-search "}
       }]
     },{

js/erp5_loader.js

@@ -2985,19 +2985,25 @@
   map.actions = {
 
     "custom_checkbox_search": function (obj) {
-      var form_check_list, i, check_len, check, value_str;
-
-      // TODO: it should be possible to inherit results so a dynamic listview
-      // could be child of a form, which is not dynamic!
-      form_check_list = obj.element.parentNode.parentNode.nextSibling.getElementsByTagName("input");
+      var form_check_list, i, check_len, check, value_str, target;
+
+      // TODO: checkbox-listview should be child of form. This requires
+      // inheriting dynamic data, which still does not work... !
+      // TODO: find better way to set the key to search, if possible not
+      // on the checkbox unless it's easy to set and get!!!
+      target = obj.element.getAttribute("data-column");
+      // HM
+      form_check_list = obj.element.parentNode.parentNode.parentNode
+        .getElementsByTagName("ul")[0].getElementsByTagName("input");
       value_str = "";
 
       for (i = 0, check_len = form_check_list.length; i < check_len; i += 1) {
         check = form_check_list[i];
         if (check.type = "checkbox" && check.checked) {
-          value_str += "group=" + check.id.split("select_")[1] + "|";
+          value_str += target + "=" + check.id.split("select_")[1] + "|";
         }
       }
+
       $.mobile.changePage(
         "#" + window.encodeURIComponent(
           "product_module&query:" + value_str.slice(0,-1)