Commit 6ba5182d authored by Gabriel Monnerat's avatar Gabriel Monnerat

erp5_web_renderjs_ui: clean up

parent 8cadc3a2
...@@ -24,32 +24,17 @@ ...@@ -24,32 +24,17 @@
extended_search: result extended_search: result
} }
}); });
})
.push(function () {
var restore_filter_input = gadget.element.querySelectorAll("input")[0];
restore_filter_input.disabled = false;
restore_filter_input.classList.remove("ui-disabled");
}); });
}) })
.declareMethod('getSearchCriteria', function (a, b) { .declareMethod('getSearchCriteria', function (a, b) {
return Query.objectToSearchText(new ComplexQuery({ return Query.objectToSearchText(
operator: "AND",
type: "complex",
query_list: [
new SimpleQuery({
operator: "",
key: this.state.extended_search_mapping[a].key,
type: "simple",
value: this.state.extended_search_mapping[a].value
}),
new SimpleQuery({ new SimpleQuery({
operator: "", operator: "",
key: this.state.x, key: this.state.extended_search_mapping[b].value,
type: "simple", type: "simple",
value: b value: a
}) })
] );
}));
}) })
///////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////
// declared methods // declared methods
...@@ -177,6 +162,10 @@ ...@@ -177,6 +162,10 @@
"select_list": select_list.concat(group_by) "select_list": select_list.concat(group_by)
}; };
} else { } else {
data.extended_search_mapping[options.title] = {
"key": group_by,
"value": options.group_by
};
data.query = { data.query = {
"query": Query.objectToSearchText(new ComplexQuery({ "query": Query.objectToSearchText(new ComplexQuery({
operator: "AND", operator: "AND",
......
...@@ -246,7 +246,7 @@ ...@@ -246,7 +246,7 @@
</item> </item>
<item> <item>
<key> <string>serial</string> </key> <key> <string>serial</string> </key>
<value> <string>995.17898.45843.30139</string> </value> <value> <string>997.7486.55612.53862</string> </value>
</item> </item>
<item> <item>
<key> <string>state</string> </key> <key> <string>state</string> </key>
...@@ -264,7 +264,7 @@ ...@@ -264,7 +264,7 @@
</tuple> </tuple>
<state> <state>
<tuple> <tuple>
<float>1633479573.07</float> <float>1640630356.79</float>
<string>UTC</string> <string>UTC</string>
</tuple> </tuple>
</state> </state>
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment