From d3c48fca122e88e3fa8424aaa19c009fddaf783f Mon Sep 17 00:00:00 2001
From: Antony Lesuisse <al@openerp.com>
Date: Sat, 28 Apr 2012 01:18:52 +0200
Subject: [PATCH] form move delete and duplicate in more

bzr revid: al@openerp.com-20120427231852-rsu3f4huxhv8c38v
---
 addons/web/static/src/js/view_form.js | 23 ++++--------------
 addons/web/static/src/js/views.js     | 35 ++++++++++++---------------
 addons/web/static/src/xml/base.xml    |  2 --
 3 files changed, 21 insertions(+), 39 deletions(-)

diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js
index 3c15e845f56..649b7b38a7b 100644
--- a/addons/web/static/src/js/view_form.js
+++ b/addons/web/static/src/js/view_form.js
@@ -90,8 +90,6 @@ instance.web.FormView = instance.web.View.extend({
         }
         this.$buttons.on('click','.oe_form_button_create',this.on_button_create);
         this.$buttons.on('click','.oe_form_button_edit',this.on_button_edit);
-        this.$buttons.on('click','.oe_form_button_duplicate',this.on_button_duplicate);
-        this.$buttons.on('click','.oe_form_button_delete',this.on_button_delete);
         this.$buttons.on('click','.oe_form_button_save',this.on_button_save);
         this.$buttons.on('click','.oe_form_button_cancel',this.on_button_cancel);
 
@@ -112,13 +110,11 @@ instance.web.FormView = instance.web.View.extend({
             if(this.fields_view.toolbar) {
                 this.sidebar.add_toolbar(this.fields_view.toolbar);
             }
-            this.sidebar.add_items('other', [{
-                label: _t('Set Default'),
-                form: this,
-                callback: function (item) {
-                    item.form.open_defaults_dialog();
-                }
-            }]);
+            this.sidebar.add_items('other', [
+                { label: _t('Delete'), callback: self.on_button_delete },
+                { label: _t('Duplicate'), callback: self.on_button_duplicate },
+                { label: _t('Set Default'), callback: function (item) { self.open_defaults_dialog(); } },
+            ]);
         }
         this.on("change:mode", this, this.switch_mode);
         this.set({mode: this.options.initial_mode});
@@ -865,15 +861,6 @@ instance.web.FormView = instance.web.View.extend({
     },
 });
 
-/**
- * Interface to be implemented by rendering engines for the form view.
- */
-instance.web.form.FormRenderingEngineInterface = {
-    set_fields_view: function(fields_view) {},
-    set_fields_registry: function(fields_registry) {},
-    render_to: function($element) {},
-};
-
 /**
  * Default rendering engine for the form view.
  * 
diff --git a/addons/web/static/src/js/views.js b/addons/web/static/src/js/views.js
index 811318b145a..7e7256f2d5d 100644
--- a/addons/web/static/src/js/views.js
+++ b/addons/web/static/src/js/views.js
@@ -768,25 +768,6 @@ instance.web.Sidebar = instance.web.Widget.extend({
         self.$element.html(QWeb.render('Sidebar', {widget: self}));
         this.$element.find('ul').hide();
     },
-    add_section: function() {
-        var self = this;
-    },
-    add_toolbar: function(toolbar) {
-        var self = this;
-        _.each(['print','action','relate'], function(type) {
-            var items = toolbar[type];
-            if (items) {
-                for (var i = 0; i < items.length; i++) {
-                    items[i] = {
-                        label: items[i]['name'],
-                        action: items[i],
-                        classname: 'oe_sidebar_' + type
-                    }
-                }
-                self.add_items(type=='print' ? 'print' : 'other', items);
-            }
-        });
-    },
     /**
      * For each item added to the section:
      *
@@ -819,6 +800,22 @@ instance.web.Sidebar = instance.web.Widget.extend({
             this.redraw();
         }
     },
+    add_toolbar: function(toolbar) {
+        var self = this;
+        _.each(['print','action','relate'], function(type) {
+            var items = toolbar[type];
+            if (items) {
+                for (var i = 0; i < items.length; i++) {
+                    items[i] = {
+                        label: items[i]['name'],
+                        action: items[i],
+                        classname: 'oe_sidebar_' + type
+                    }
+                }
+                self.add_items(type=='print' ? 'print' : 'other', items);
+            }
+        });
+    },
     on_item_action_clicked: function(item) {
         var self = this;
         self.getParent().sidebar_context().then(function (context) {
diff --git a/addons/web/static/src/xml/base.xml b/addons/web/static/src/xml/base.xml
index 2cb0907f390..6fbbadf7adb 100644
--- a/addons/web/static/src/xml/base.xml
+++ b/addons/web/static/src/xml/base.xml
@@ -725,8 +725,6 @@
         <span class="oe_form_buttons_view">
             <button type="button" class="oe_button oe_form_button_edit">Edit</button>
             <button type="button" class="oe_button oe_form_button_create">Create</button>
-            <button type="button" class="oe_button oe_form_button_duplicate">Duplicate</button>
-            <button type="button" class="oe_button oe_form_button_delete">Delete</button>
         </span>
         <span class="oe_form_buttons_edit">
             <button type="button" class="oe_button oe_form_button_save">Save</button> <span class="oe_fade">or</span> <a href="#" class="oe_bold oe_form_button_cancel">Discard</a>