odoo
/
odoo
2
0
Fork 0
Code Pull Requests Releases Activity

[IMP] Support for classnames in m2o autocomplete 

Also improved readability of code

bzr revid: fme@openerp.com-20120829153756-7b3lq5lan6b97chy
This commit is contained in:
Fabien Meghazi 2012-08-29 17:37:56 +02:00
parent d78cd0a57d
commit ba7aee832d
3 changed files with 40 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
addons/web/static/src/css/base.css
View File

@ -2399,6 +2399,13 @@
float: right;
padding-left: 2px;
}
.openerp.ui-autocomplete li.oe_m2o_dropdown_option a {
font-style: italic;
padding-left: 2em;
}
.openerp.ui-autocomplete li:not(.oe_m2o_dropdown_option) + li.oe_m2o_dropdown_option {
margin-top: 10px;
}
.openerp .oe_form .oe_form_field_one2many > .oe_view_manager .oe_list_pager_single_page {
display: none;
}

6
addons/web/static/src/css/base.sass
View File

@ -1851,6 +1851,12 @@ $sheet-max-width: 860px
line-height: 14px
float: right
padding-left: 2px
&.ui-autocomplete
li.oe_m2o_dropdown_option a
font-style: italic
padding-left: 2em
li:not(.oe_m2o_dropdown_option) + li.oe_m2o_dropdown_option
margin-top: 10px
// }}}
// FormView.one2many {{{
.oe_form .oe_form_field_one2many > .oe_view_manager

42
addons/web/static/src/js/view_form.js
View File

@ -2563,7 +2563,7 @@ instance.web.form.FieldSelection = instance.web.form.AbstractField.extend(instan
}
});
// jquery autocomplete tweak to allow html
// jquery autocomplete tweak to allow html and classnames
(function() {
var proto = $.ui.autocomplete.prototype,
initSource = proto._initSource;
@ -2590,7 +2590,8 @@ instance.web.form.FieldSelection = instance.web.form.AbstractField.extend(instan
return $( "<li></li>" )
.data( "item.autocomplete", item )
.append( $( "<a></a>" )[ this.options.html ? "html" : "text" ]( item.label ) )
.appendTo( ul );
.appendTo( ul )
.addClass(item.classname);
}
});
})();
@ -2630,25 +2631,36 @@ instance.web.form.CompletionFieldMixin = {
// search more... if more results that max
if (values.length > self.limit) {
values = values.slice(0, self.limit);
values.push({label: _t("<em>   Search More...</em>"), action: function() {
dataset.name_search(search_val, self.build_domain(), 'ilike'
, false, function(data) {
self._search_create_popup("search", data);
});
}});
values.push({
label: _t("Search More..."),
action: function() {
dataset.name_search(search_val, self.build_domain(), 'ilike', false, function(data) {
self._search_create_popup("search", data);
});
},
classname: 'oe_m2o_dropdown_option'
});
}
// quick create
var raw_result = _(data.result).map(function(x) {return x[1];});
if (search_val.length > 0 && !_.include(raw_result, search_val)) {
values.push({label: _.str.sprintf(_t('<em>   Create "<strong>%s</strong>"</em>'),
$('<span />').text(search_val).html()), action: function() {
self._quick_create(search_val);
}});
values.push({
label: _.str.sprintf(_t('Create "<strong>%s</strong>"'),
$('<span />').text(search_val).html()),
action: function() {
self._quick_create(search_val);
},
classname: 'oe_m2o_dropdown_option'
});
}
// create...
values.push({label: _t("<em>   Create and Edit...</em>"), action: function() {
self._search_create_popup("form", undefined, self._create_context(search_val));
}});
values.push({
label: _t("Create and Edit..."),
action: function() {
self._search_create_popup("form", undefined, self._create_context(search_val));
},
classname: 'oe_m2o_dropdown_option'
});
return values;
});