listview refactor part2

bzr revid: al@openerp.com-20120409201647-97r7h4nd3lid42si

3 files changed, 13 insertions, 12 deletions

diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js
index c27bbc465bf..c4bac3c2cd1 100644
--- a/addons/web/static/src/js/view_form.js
+++ b/addons/web/static/src/js/view_form.js
@@ -78,10 +78,10 @@ openerp.web.FormView = openerp.web.View.extend({
         this.$pager = this.options.$pager || this.$element.find('.oe_form_pager');
 
         this.$buttons.html(QWeb.render("FormView.buttons", {'widget':self}));
-        this.$pager.html(QWeb.render("FormView.pager", {'widget':self}));
-
         this.$buttons.on('click','.oe_form_buttons button.oe_form_button_save',this.on_button_save);
         this.$buttons.on('click','.oe_form_buttons button.oe_form_button_cancel',this.on_button_cancel);
+
+        this.$pager.html(QWeb.render("FormView.pager", {'widget':self}));
         this.$pager.on('click','.oe_form_pager button[data-pager-action]',function(event) {
             var action = $(this).data('pager-action');
             self.on_pager_action(action);
diff --git a/addons/web/static/src/js/view_list.js b/addons/web/static/src/js/view_list.js
index 11b1c3fdd57..1aabfd41d00 100644
--- a/addons/web/static/src/js/view_list.js
+++ b/addons/web/static/src/js/view_list.js
@@ -232,12 +232,14 @@ openerp.web.ListView = openerp.web.View.extend( /** @lends openerp.web.ListView#
 
         // Add and delete
         this.$buttons = this.options.$buttons || this.$element.find('.oe_list_buttons');
-        this.$element.find('.oe-list-add') .click(this.proxy('do_add_record')) .attr('disabled', grouped && this.options.editable);
-        this.$element.find('.oe-list-delete') .attr('disabled', true) .click(this.proxy('do_delete_selected'));
+        this.$buttons.html(QWeb.render("ListView.buttons", {'widget':self}));
+        this.$buttons.find('.oe_list_add') .click(this.proxy('do_add_record')) .attr('disabled', grouped && this.options.editable);
+        this.$buttons.find('.oe_list_delete') .attr('disabled', true) .click(this.proxy('do_delete_selected'));
 
         // Pager
         this.$pager = this.options.$pager || this.$element.find('.oe_list_pager');
-        this.$element.find('.oe-list-pager')
+        this.$pager.html(QWeb.render("FormView.pager", {'widget':self}));
+        this.$pager.find('.oe_list_pager')
             .delegate('button', 'click', function () {
                 var $this = $(this);
                 switch ($this.data('pager-action')) {
@@ -478,7 +480,6 @@ openerp.web.ListView = openerp.web.View.extend( /** @lends openerp.web.ListView#
     reload: function () {
         return this.reload_content();
     },
-
     do_load_state: function(state, warm) {
         var reload = false;
         if (state.page && this.page !== state.page) {
@@ -543,7 +544,7 @@ openerp.web.ListView = openerp.web.View.extend( /** @lends openerp.web.ListView#
      * @param {Array} records selected record values
      */
     do_select: function (ids, records) {
-        this.$element.find('.oe-list-delete').attr('disabled', !ids.length);
+        this.$buttons.find('.oe_list_delete').attr('disabled', !ids.length);
         if (!ids.length) {
             this.dataset.index = 0;
             if (this.sidebar) {
diff --git a/addons/web/static/src/xml/base.xml b/addons/web/static/src/xml/base.xml
index 2050aad45fa..3c1cfbfb7d2 100644
--- a/addons/web/static/src/xml/base.xml
+++ b/addons/web/static/src/xml/base.xml
@@ -595,17 +595,17 @@
     </tfoot>
 </table>
 <t t-name="ListView.buttons">
-    <div t-if="!no_leaf and options.action_buttons !== false" class="oe_list_buttons">
-        <button type="button" class="oe_button oe-list-add" t-if="options.addable">
-            <t t-esc="options.addable"/>
+    <div t-if="!widget.no_leaf and widget.options.action_buttons !== false" class="oe_list_buttons">
+        <button type="button" class="oe_button oe_list_add" t-if="widget.options.addable">
+            <t t-esc="widget.options.addable"/>
         </button>
-        <button type="button" class="oe_button oe-list-delete" t-if="options.selectable and options.deletable">
+        <button type="button" class="oe_button oe_list_delete" t-if="widget.options.selectable and widget.options.deletable">
             Delete
         </button>
     </div>
 </t>
 <t t-name="Listview.pager">
-    <div t-if="!no_leaf and options.pager !== false" class="oe-list-pager" t-att-colspan="columns_count">
+    <div t-if="!widget.no_leaf and widget.options.pager !== false" class="oe_list_pager" t-att-colspan="widget.columns_count">
         <t t-call="ViewPager">
             <span class="oe-pager-state">
             </span>