Techsystech
/
web
mirror of https://github.com/OCA/web.git
3
0
Fork 1
Code Issues Packages Projects Releases Wiki Activity

inhibit closing the menu when selecting from the dropdown

pull/1551/head
Holger Brunn 2017-02-17 20:30:27 +01:00 committed by Alexandre Díaz
parent 33c4483f16
commit 2ad33e82cf
2 changed files with 20 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
web_advanced_search/static/src/js/web_advanced_search_x2x.js
View File

@ -53,6 +53,10 @@ odoo.define('web_advanced_search_x2x.search_filters', function (require) {
this._super.apply(this, arguments); this._super.apply(this, arguments);
if (this.relational) { if (this.relational) {
this.x2x_field().appendTo(this.$el); this.x2x_field().appendTo(this.$el);
this._x2x_field.$el.on(
"autocompleteopen",
this.proxy('x2x_autocomplete_open')
);
} }
delete this.relational; delete this.relational;
}, },
@ -85,6 +89,7 @@ odoo.define('web_advanced_search_x2x.search_filters', function (require) {
name: this.field.name, name: this.field.name,
options: JSON.stringify({ options: JSON.stringify({
no_create: true, no_create: true,
no_open: true,
model: this.field.relation, model: this.field.relation,
}), }),
}, },
@ -111,6 +116,18 @@ odoo.define('web_advanced_search_x2x.search_filters', function (require) {
return "char_domain"; return "char_domain";
} }
}, },
x2x_autocomplete_open: function()
{
var widget = this._x2x_field.$input.autocomplete("widget");
widget.on('click', 'li', function(e)
{
widget.trigger(
'menuselect',
{item: jQuery(e.currentTarget)}
);
e.stopPropagation();
});
},
get_domain: function () { get_domain: function () {
// Special way to get domain if user chose "domain" filter // Special way to get domain if user chose "domain" filter
if (this.get_operator() == "domain") { if (this.get_operator() == "domain") {
@ -227,10 +244,10 @@ odoo.define('web_advanced_search_x2x.search_filters', function (require) {
_.each(compound_domains, function(domain) _.each(compound_domains, function(domain)
{ {
combined.add(domain.eval()); combined.add(domain.eval());
}) });
_.each(leaves, function(leaf) _.each(leaves, function(leaf)
{ {
combined.add([leaf]) combined.add([leaf]);
}); });
result.domains[index] = combined; result.domains[index] = combined;
} }

2
web_advanced_search/views/templates.xml
View File

@ -5,7 +5,7 @@
<template id="assets_backend" name="web_advanced_search_x2x assets" inherit_id="web.assets_backend"> <template id="assets_backend" name="web_advanced_search_x2x assets" inherit_id="web.assets_backend">
<xpath expr="." position="inside"> <xpath expr="." position="inside">
<script type="text/javascript" src="/web_advanced_search_x2x/static/src/js/web_advanced_search_x2x.js"></script> <script type="text/javascript" src="/web_advanced_search_x2x/static/src/js/web_advanced_search_x2x.js"/>
</xpath> </xpath>
</template> </template>