From ff16b9c9888a51855d54c4203ecdabbe49c46713 Mon Sep 17 00:00:00 2001
From: Antony Lesuisse <al@openerp.com>
Date: Thu, 19 Apr 2012 10:28:15 +0200
Subject: [FIX] pad

bzr revid: al@openerp.com-20120419082815-3rkd76h0bztnb3p1
---
 addons/pad/static/src/js/pad.js   | 17 +++++++----------
 addons/pad/static/src/xml/pad.xml |  8 --------
 2 files changed, 7 insertions(+), 18 deletions(-)

(limited to 'addons/pad/static/src')

diff --git a/addons/pad/static/src/js/pad.js b/addons/pad/static/src/js/pad.js
index acc91f2273e..9f5ab3876b3 100644
--- a/addons/pad/static/src/js/pad.js
+++ b/addons/pad/static/src/js/pad.js
@@ -1,6 +1,10 @@
 openerp.pad = function(instance) {
 
-instance.web.form.SidebarAttachments = instance.web.form.SidebarAttachments.extend({
+instance.web.Sidebar = instance.web.Sidebar.extend({
+    init: function(parent) {
+        this._super(parent);
+        this.add_items('other',[{ label: "Pad", callback: this.on_add_pad }]);
+    },
     on_attachments_loaded: function(attachments) {
         this._super(attachments);
         var self = this;
@@ -8,18 +12,11 @@ instance.web.form.SidebarAttachments = instance.web.form.SidebarAttachments.exte
         var is_pad = function(a) {
             return a.type == 'url' && a.name == 'Pad';
         };
-        if (_.any(attachments, is_pad)) {
-            $padbtn.hide();
-        } else {
-            $padbtn.show().click(self.on_add_pad);
-        }
     },
     on_add_pad: function() {
         var self = this;
-        var $padbtn = this.$element.find('button.pad');
-        $padbtn.attr('disabled', 'true').find('img, span').toggle();
-        this.view.dataset.call_button('pad_get', [[this.view.datarecord.id], this.view.dataset.get_context()], function(r) {
-            $padbtn.hide();
+        var view = this.getParent();
+        view.dataset.call_button('pad_get', [[view.datarecord.id], view.dataset.get_context()], function(r) {
             self.do_update();
             self.do_action(r.result);
         });
diff --git a/addons/pad/static/src/xml/pad.xml b/addons/pad/static/src/xml/pad.xml
index c17464e6646..e922294d03d 100644
--- a/addons/pad/static/src/xml/pad.xml
+++ b/addons/pad/static/src/xml/pad.xml
@@ -2,12 +2,4 @@
 <!-- vim:fdl=1:
 -->
 <templates id="template" xml:space="preserve">
-    <t t-extend="FormView.sidebar.attachments">
-        <t t-jquery="div.oe-binary-file-set" t-operation="append">
-                <button class="button pad" type="button">
-                    <img src="/web/static/src/img/throbber.gif" width="16" height="16" style="display: none"/>
-                    <span>Add Pad</span>
-                </button>
-        </t>
-    </t>
 </templates>
-- 
cgit v1.2.3


From 08901b13930e79bc39833a0f6445969ce669fd8e Mon Sep 17 00:00:00 2001
From: Antony Lesuisse <al@openerp.com>
Date: Thu, 19 Apr 2012 10:46:50 +0200
Subject: [FIX] pad action

bzr revid: al@openerp.com-20120419084650-clu7oke9rz6me6pi
---
 addons/pad/static/src/js/pad.js | 14 +++-----------
 1 file changed, 3 insertions(+), 11 deletions(-)

(limited to 'addons/pad/static/src')

diff --git a/addons/pad/static/src/js/pad.js b/addons/pad/static/src/js/pad.js
index 9f5ab3876b3..2e5f8820ac4 100644
--- a/addons/pad/static/src/js/pad.js
+++ b/addons/pad/static/src/js/pad.js
@@ -5,20 +5,12 @@ instance.web.Sidebar = instance.web.Sidebar.extend({
         this._super(parent);
         this.add_items('other',[{ label: "Pad", callback: this.on_add_pad }]);
     },
-    on_attachments_loaded: function(attachments) {
-        this._super(attachments);
-        var self = this;
-        var $padbtn = self.$element.find('button.pad');
-        var is_pad = function(a) {
-            return a.type == 'url' && a.name == 'Pad';
-        };
-    },
     on_add_pad: function() {
         var self = this;
         var view = this.getParent();
-        view.dataset.call_button('pad_get', [[view.datarecord.id], view.dataset.get_context()], function(r) {
-            self.do_update();
-            self.do_action(r.result);
+        var model = new instance.web.Model('ir.attachment');
+        model.call('pad_get', [view.model ,view.datarecord.id],{}).then(function(r) {
+            self.do_action({ type: "ir.actions.act_url", url: r });
         });
     }
 });
-- 
cgit v1.2.3