audrius/web
1
0
Fork 1
mirror of https://github.com/OCA/web.git synced 2025-02-22 13:21:25 +02:00
Code Issues Packages Projects Releases Wiki Activity

[FIX] don't close advanced search prematurely; display fixes

Browse Source
This commit is contained in:
Holger Brunn
2018-04-30 12:57:09 +02:00
committed by Pedro M. Baeza
parent eb1b60928b
commit f175987c4a
3 changed files with 14 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
web_advanced_search_x2x/__openerp__.py
View File

@@ -27,6 +27,7 @@ domain popups.
"summary": "Use a search widget in advanced search for x2x fields",
"depends": [
'web',
'web_m2x_options',
],
"qweb": [
'static/src/xml/web_advanced_search_x2x.xml',

1
web_advanced_search_x2x/static/src/css/web_advanced_search_x2x.css
View File

@@ -1,5 +1,6 @@
.openerp .searchview_extended_prop_value .oe_form_field_with_button
{
display: inline-block;
position: relative;
}
.openerp .oe_searchview_drawer .web_advanced_search_x2x_domain

16
web_advanced_search_x2x/static/src/js/web_advanced_search_x2x.js
View File

@@ -4,7 +4,7 @@
openerp.web_advanced_search_x2x = function(instance)
{
instance.web_advanced_search_x2x.ExtendedSearchPropositionMany2One =
instance.web_advanced_search_x2x.ExtendedSearchPropositionMany2One =
instance.web.search.ExtendedSearchProposition.Char.extend(
instance.web.form.FieldManagerMixin,
{
@@ -47,7 +47,9 @@ openerp.web_advanced_search_x2x = function(instance)
return {
attrs: {
name: this.field.name,
options: '{"no_create": true}',
options:
'{"create": false, "create_edit": false, ' +
'"no_open": true}',
},
}
},
@@ -59,6 +61,7 @@ openerp.web_advanced_search_x2x = function(instance)
}
this.searchfield = new instance.web.form.FieldMany2One(
this, this.create_searchfield_node());
this.searchfield.view = this;
return this.searchfield;
},
operator_changed: function(e)
@@ -71,6 +74,9 @@ openerp.web_advanced_search_x2x = function(instance)
if(this.show_searchfield())
{
this.create_searchfield().appendTo(this.$el.empty());
this.searchfield.$input.autocomplete('widget').on(
'click', this, function(e) { e.stopPropagation() }
);
}
if(this.show_domain_selection())
{
@@ -209,8 +215,9 @@ openerp.web_advanced_search_x2x = function(instance)
.prop('disabled', self.searchview.build_search_data().domains.length == 0);
self.$buttonpane.find(".oe_selectcreatepopup-search-select")
.unbind('click')
.click(function()
.click(function(e)
{
e.stopPropagation();
self.select_elements(self.selected_ids)
.then(function()
{
@@ -228,10 +235,11 @@ openerp.web_advanced_search_x2x = function(instance)
});
});
},
select_domain: function()
select_domain: function(e)
{
var self = this,
search = this.searchview.build_search_data();
e.stopPropagation();
instance.web.pyeval.eval_domains_and_contexts({
domains: search.domains,
contexts: search.contexts,