From 23ec19c2fb7675cc9f2032a90ac68f9c256a43dd Mon Sep 17 00:00:00 2001
From: Fabien Meghazi <fme@openerp.com>
Date: Tue, 28 Jun 2011 18:01:03 +0200
Subject: [ADD] Added DataSet#call_button javascript side

bzr revid: fme@openerp.com-20110628160103-jpkd4r1batz5nlfp
---
 addons/base/static/src/js/data.js | 9 +++++++++
 1 file changed, 9 insertions(+)

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

diff --git a/addons/base/static/src/js/data.js b/addons/base/static/src/js/data.js
index 2d2b36f696a..9208e7138ab 100644
--- a/addons/base/static/src/js/data.js
+++ b/addons/base/static/src/js/data.js
@@ -328,6 +328,15 @@ openerp.base.DataSet =  openerp.base.Controller.extend( /** @lends openerp.base.
             args: args || []
         }, callback, error_callback);
     },
+    call_button: function (method, args, callback, error_callback) {
+        return this.rpc('/base/dataset/call_button', {
+            model: this.model,
+            method: method,
+            domain_id: null,
+            context_id: 1,
+            args: args || []
+        }, callback, error_callback);
+    },
     /**
      * Arguments:
      * name='', args=[], operator='ilike', context=None, limit=100
-- 
cgit v1.2.3


From 48a76551269c3a55fa80e3cd248f7e9f5c86b7a6 Mon Sep 17 00:00:00 2001
From: Fabien Meghazi <fme@openerp.com>
Date: Tue, 28 Jun 2011 18:35:07 +0200
Subject: [FIX] Use record_id instead of dataset in View#execute_action

bzr revid: fme@openerp.com-20110628163507-diaevrugqyxkfcvn
---
 addons/base/static/src/js/views.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

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

diff --git a/addons/base/static/src/js/views.js b/addons/base/static/src/js/views.js
index 6852e5595e4..cfd12ee9c7b 100644
--- a/addons/base/static/src/js/views.js
+++ b/addons/base/static/src/js/views.js
@@ -432,8 +432,8 @@ openerp.base.View = openerp.base.Controller.extend({
             if (action && action.constructor == Object) {
                 action.context = action.context || {};
                 _.extend(action.context, {
-                    active_id: dataset.ids[dataset.index],
-                    active_ids: [dataset.ids[dataset.index]],
+                    active_id: record_id || false,
+                    active_ids: [record_id || false],
                     active_model: dataset.model
                 });
                 action.flags = {
@@ -462,7 +462,7 @@ openerp.base.View = openerp.base.Controller.extend({
             var context = new openerp.base.CompoundContext(dataset.context).add(action_data.context || {});
             switch(action_data.type) {
                 case 'object':
-                    return dataset.call_and_eval(action_data.name, [[record_id], context], null, 1, handler);
+                    return dataset.call_button(action_data.name, [[record_id], context], handler);
                 case 'action':
                     return this.rpc('/base/action/load', { action_id: parseInt(action_data.name, 10), context: context }, handler);
                 default:
-- 
cgit v1.2.3


From f07f60b3da21fa6980ae7b29af2c2bdf180adc60 Mon Sep 17 00:00:00 2001
From: Fabien Meghazi <fme@openerp.com>
Date: Tue, 28 Jun 2011 18:42:38 +0200
Subject: [IMP] Use label@colspan in order to diferentiate fields label from
 paragraph

bzr revid: fme@openerp.com-20110628164238-zctbvza7isf4166t
---
 addons/base/static/src/js/form.js   | 10 ++++++++--
 addons/base/static/src/xml/base.xml |  3 +++
 2 files changed, 11 insertions(+), 2 deletions(-)

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

diff --git a/addons/base/static/src/js/form.js b/addons/base/static/src/js/form.js
index 8044c425661..b7a61cc885a 100644
--- a/addons/base/static/src/js/form.js
+++ b/addons/base/static/src/js/form.js
@@ -677,12 +677,18 @@ openerp.base.form.WidgetButton = openerp.base.form.Widget.extend({
 
 openerp.base.form.WidgetLabel = openerp.base.form.Widget.extend({
     init: function(view, node) {
-        this.is_field_label = true;
         this.element_name = 'label_' + node.attrs.name;
 
         this._super(view, node);
 
-        this.template = "WidgetLabel";
+        // TODO fme: support for attrs.align
+        if (this.node.tag == 'label' && this.node.attrs.colspan) {
+            this.is_field_label = false;
+            this.template = "WidgetParagraph";
+        } else {
+            this.is_field_label = true;
+            this.template = "WidgetLabel";
+        }
         this.colspan = 1;
     },
     render: function () {
diff --git a/addons/base/static/src/xml/base.xml b/addons/base/static/src/xml/base.xml
index de95a4294e8..9bef00147d3 100644
--- a/addons/base/static/src/xml/base.xml
+++ b/addons/base/static/src/xml/base.xml
@@ -468,6 +468,9 @@
         <t t-if="widget.string and widget.node.tag != 'label'">:</t>
     </label>
 </t>
+<t t-name="WidgetParagraph">
+    <p class="oe_form_paragraph"><t t-esc="widget.string"/></p>
+</t>
 <t t-name="FieldChar">
     <input type="text"
         t-att-name="widget.name"
-- 
cgit v1.2.3