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

[fix] rollback of previous fix regarding list view buttons and replacement with another fix 

bzr revid: nicolas.vanhoren@openerp.com-20120516145231-joteecabrzclkr2j
This commit is contained in:
niv-openerp 2012-05-16 16:52:31 +02:00
parent 3b88adcdd8
commit cf941ebbaf
3 changed files with 2 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -3220,7 +3220,6 @@ instance.web.form.FieldMany2ManyTags = instance.web.form.AbstractField.extend(_.
* TODO niv: clean those deferred stuff, it could be better
*/
instance.web.form.FieldMany2Many = instance.web.form.AbstractField.extend({
template: "FieldMany2Many.render",
multi_selection: false,
disable_utility_classes: true,
init: function(field_manager, node) {
@ -3271,7 +3270,6 @@ instance.web.form.FieldMany2Many = instance.web.form.AbstractField.extend({
'addable': self.get("effective_readonly") ? null : _t("Add"),
'deletable': self.get("effective_readonly") ? false : true,
'selectable': self.multi_selection,
'$buttons': $(".oe_form_view_m2m_buttons", self.$element),
});
var embedded = (this.field.views || {}).tree;
if (embedded) {
@ -3284,7 +3282,7 @@ instance.web.form.FieldMany2Many = instance.web.form.AbstractField.extend({
loaded.resolve();
});
$.async_when().then(function () {
self.list_view.appendTo($(".oe_form_view_m2m_view", self.$element));
self.list_view.appendTo(self.$element);
});
return loaded;
},

1
addons/web/static/src/js/view_list.js
View File

@ -20,6 +20,7 @@ instance.web.ListView = instance.web.View.extend( /** @lends instance.web.ListVi
'sortable': true,
// whether the view rows can be reordered (via vertical drag & drop)
'reorderable': true,
'action_buttons': true,
},
/**
* Core class for list-type displays.

6
addons/web/static/src/xml/base.xml
View File

@ -1054,12 +1054,6 @@
</span>
</t>
</t>
<t t-name="FieldMany2Many.render">
<div class="oe_form_view_m2m">
<div class="oe_form_view_m2m_buttons" />
<div class="oe_form_view_m2m_view" />
</div>
</t>
<t t-name="FieldMany2ManyTags">
<div class="oe_form_field_many2manytags">
<t t-if="! widget.get('effective_readonly')">