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

bzr revid: nicolas.vanhoren@openerp.com-20120516145231-joteecabrzclkr2j

diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js
index 8841433..23e1c9a 100644 (file)
--- a/addons/web/static/src/js/view_form.js
+++ b/addons/web/static/src/js/view_form.js
@@ -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;
     },

diff --git a/addons/web/static/src/js/view_list.js b/addons/web/static/src/js/view_list.js
index 5c9f418..e1d2e43 100644 (file)
--- a/addons/web/static/src/js/view_list.js
+++ b/addons/web/static/src/js/view_list.js
@@ -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.

diff --git a/addons/web/static/src/xml/base.xml b/addons/web/static/src/xml/base.xml
index d46c6a9..97eeab3 100644 (file)
--- a/addons/web/static/src/xml/base.xml
+++ b/addons/web/static/src/xml/base.xml
@@ -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')">