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

[IMP] UI fixes

pull/134/head
Holger Brunn 2015-05-27 09:06:09 +02:00
parent f233b91782
commit b2cae75895
2 changed files with 44 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2,12 +2,20 @@
{ {
position: relative; position: relative;
} }
.openerp .oe_searchview_drawer .web_advanced_search_x2x_domain
{
max-width: 20em;
overflow: hidden;
text-overflow: ellipsis;
display: inline-block;
}
/* copy search view's button style */ /* copy search view's button style */
.openerp .oe_searchview_drawer .web_advanced_search_x2x_search:before .openerp .oe_searchview_drawer .web_advanced_search_x2x_search:before
{ {
font: 21px "mnmliconsRegular"; font: 21px "mnmliconsRegular";
content: "r"; content: "r";
color: #a3a3a3; color: #a3a3a3;
margin-left: 5px;
} }
.openerp .oe_searchview_drawer .web_advanced_search_x2x_search .openerp .oe_searchview_drawer .web_advanced_search_x2x_search
{ {

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

@ -149,9 +149,15 @@ openerp.web_advanced_search_x2x = function(instance)
}, },
get_domain: function() get_domain: function()
{ {
if(this.show_domain_selection() && this.domain) if(this.show_domain_selection())
{ {
var self = this; var self = this;
if(!this.domain || this.domain.length == 0)
{
throw new instance.web.search.Invalid(
this.field.string, this.domain_representation,
instance.web._lt('invalid search domain'));
}
return _.extend(new instance.web.CompoundDomain(), { return _.extend(new instance.web.CompoundDomain(), {
__domains: [ __domains: [
_.map(this.domain, function(leaf) _.map(this.domain, function(leaf)
@ -209,12 +215,14 @@ openerp.web_advanced_search_x2x = function(instance)
{ {
self.$buttonpane.find(".oe_selectcreatepopup-search-create").remove(); self.$buttonpane.find(".oe_selectcreatepopup-search-create").remove();
self.$buttonpane.prepend( self.$buttonpane.prepend(
//TODO: take care that this is only clicked if we have a domain jQuery('<button/>')
jQuery('<button />')
.addClass('oe_highlight') .addClass('oe_highlight')
.addClass('oe_selectcreatepopup-search-select-domain')
.text(instance.web._lt('Use criteria')) .text(instance.web._lt('Use criteria'))
.click(self.proxy(self.select_domain)) .click(self.proxy(self.select_domain))
); );
self.$buttonpane.find('.oe_selectcreatepopup-search-select-domain')
.prop('disabled', self.searchview.build_search_data().domains.length == 0);
self.$buttonpane.find(".oe_selectcreatepopup-search-select") self.$buttonpane.find(".oe_selectcreatepopup-search-select")
.unbind('click') .unbind('click')
.click(function() .click(function()
@ -246,8 +254,17 @@ openerp.web_advanced_search_x2x = function(instance)
groupbys: search.groupbys || [] groupbys: search.groupbys || []
}).then(function(search) }).then(function(search)
{ {
//TODO: get representation from search view var representation = self.searchview.query.reduce(function(memo, term)
self.trigger('domain_selected', search.domain, String(search.domain)); {
return _.str.sprintf(
'%s%s(%s: %s)', memo, (memo ? ' ' : ''),
term.attributes.category,
_.reduce(term.get('values'), function(memo, value)
{
return memo + (memo ? ', ' : '') + value.label;
}, ''));
}, '');
self.trigger('domain_selected', search.domain, representation);
self.destroy(); self.destroy();
}) })
}, },