From 8e5a6b7c61615baaad6bed64de9fa86f888cf320 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Fri, 14 Oct 2011 14:20:20 +0200
Subject: [FIX] correctly propagate the action_data context (in a
 do_execute_action) to the action itself

This is mainly of use for buttons: the context they set should apply not only to fetching and executing the initial action, but to all calls within the popup they open, if any

lp bug: https://launchpad.net/bugs/873202 fixed

bzr revid: xmo@openerp.com-20111014122020-n3uz31ilemt1lvro
---
 addons/web/static/src/js/views.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'addons/web/static/src/js/views.js')

diff --git a/addons/web/static/src/js/views.js b/addons/web/static/src/js/views.js
index 3cc7d7eb4f8..0ec286fa357 100644
--- a/addons/web/static/src/js/views.js
+++ b/addons/web/static/src/js/views.js
@@ -859,7 +859,8 @@ db.web.View = db.web.Widget.extend(/** @lends db.web.View# */{
                     }],
                     domains: []
                 }).pipe(function (results) {
-                    action.context = results.context
+                    action.context = new db.web.CompoundContext(
+                        results.context, action_data.context);
                     return self.do_action(action, result_handler);
                 });
             } else {
-- 
cgit v1.2.3


From 414126e7240ba920c28232d9bf16647897dc4846 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Mon, 17 Oct 2011 09:24:01 +0200
Subject: [FIX] handle common case where action_data has no context, and should
 not be added to the compoundcontext

issue introduced in revision xmo@openerp.com-20111014122020-n3uz31ilemt1lvro

bzr revid: xmo@openerp.com-20111017072401-qfreccymm5bn0g4s
---
 addons/web/static/src/js/views.js | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

(limited to 'addons/web/static/src/js/views.js')

diff --git a/addons/web/static/src/js/views.js b/addons/web/static/src/js/views.js
index 0ec286fa357..a12b30f0380 100644
--- a/addons/web/static/src/js/views.js
+++ b/addons/web/static/src/js/views.js
@@ -859,10 +859,14 @@ db.web.View = db.web.Widget.extend(/** @lends db.web.View# */{
                     }],
                     domains: []
                 }).pipe(function (results) {
-                    action.context = new db.web.CompoundContext(
-                        results.context, action_data.context);
+                    if (!action_data.context) {
+                        action.context = results.context
+                    } else {
+                        action.context = new db.web.CompoundContext(
+                            results.context, action_data.context);
+                    }
                     return self.do_action(action, result_handler);
-                });
+                }, null);
             } else {
                 return result_handler();
             }
-- 
cgit v1.2.3


From 1d0b38d034f2f898f191acdc84200be00db6be5b Mon Sep 17 00:00:00 2001
From: Fabien Meghazi <fme@openerp.com>
Date: Mon, 17 Oct 2011 14:23:35 +0200
Subject: [FIX] No title on page trigered by an action

lp bug: https://launchpad.net/bugs/872148 fixed

bzr revid: fme@openerp.com-20111017122335-vov2sy95sdt3dwp9
---
 addons/web/static/src/js/views.js | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

(limited to 'addons/web/static/src/js/views.js')

diff --git a/addons/web/static/src/js/views.js b/addons/web/static/src/js/views.js
index a12b30f0380..32e17db641f 100644
--- a/addons/web/static/src/js/views.js
+++ b/addons/web/static/src/js/views.js
@@ -431,10 +431,16 @@ db.web.ViewManagerAction = db.web.ViewManager.extend(/** @lends oepnerp.web.View
     on_mode_switch: function (view_type) {
         var self = this;
         return $.when(
-            this._super(view_type),
-            this.shortcut_check(this.views[view_type])).then(function () {
-                var view_id = self.views[self.active_view].controller.fields_view.view_id;
+                this._super(view_type),
+                this.shortcut_check(this.views[view_type])
+            ).then(function() {
+                var controller = self.views[self.active_view].controller,
+                    fvg = controller.fields_view,
+                    view_id = (fvg && fvg.view_id) || '--';
                 self.$element.find('.oe_get_xml_view span').text(view_id);
+                if (!self.action.name && fvg) {
+                    self.$element.find('.oe_view_title').text(fvg.arch.attrs.string || fvg.name);
+                }
         });
     },
     shortcut_check : function(view) {
-- 
cgit v1.2.3


From 27869cac8b76baea212575cf95c351a3cf5aa7d2 Mon Sep 17 00:00:00 2001
From: Christophe Simonis <chs@openerp.com>
Date: Mon, 10 Oct 2011 14:34:32 +0200
Subject: [IMP] change the way the sections and items are added to the sidebar

bzr revid: chs@openerp.com-20111010123432-619o61elz09jm9sy
---
 addons/web/static/src/js/views.js | 139 +++++++++++++++++++++++---------------
 1 file changed, 85 insertions(+), 54 deletions(-)

(limited to 'addons/web/static/src/js/views.js')

diff --git a/addons/web/static/src/js/views.js b/addons/web/static/src/js/views.js
index aeedee706d8..50ffb4bbbc5 100644
--- a/addons/web/static/src/js/views.js
+++ b/addons/web/static/src/js/views.js
@@ -512,6 +512,52 @@ db.web.Sidebar = db.web.Widget.extend({
             self.do_toggle();
         });
     },
+
+    call_default_on_sidebar: function(item) {
+        var func_name = 'on_sidebar_' + _.underscored(item.label);
+        var fn = this.widget_parent[func_name];
+        if(typeof fn === 'function') {
+            fn(item);
+        }
+    },
+
+    add_default_sections: function() {
+        this.add_items('Customize', [
+            {
+                label: "Manage Views",
+                callback: this.call_default_on_sidebar,
+                title: "Manage views of the current object"
+            }, {
+                label: "Edit Workflow",
+                callback: this.call_default_on_sidebar,
+                title: "Manage views of the current object",
+                classname: 'oe_hide oe_sidebar_edit_workflow'
+            }, {
+                label: "Customize Object",
+                callback: this.call_default_on_sidebar,
+                title: "Manage views of the current object"
+            }
+        ]);
+
+        this.add_items('Other Options', [ 
+            {
+                label: "Import",
+                callback: this.call_default_on_sidebar,
+            }, {
+                label: "Export",
+                callback: this.call_default_on_sidebar,
+            }, {
+                label: "Translate",
+                callback: this.call_default_on_sidebar,
+                classname: 'oe_sidebar_translate oe_hide'
+            }, {
+                label: "View Log",
+                callback: this.call_default_on_sidebar,
+                classname: 'oe_hide oe_sidebar_view_log'
+            }
+        ]);
+    },
+
     add_toolbar: function(toolbar) {
         var self = this;
         _.each([['print', "Reports"], ['action', "Actions"], ['relate', "Links"]], function(type) {
@@ -524,15 +570,29 @@ db.web.Sidebar = db.web.Widget.extend({
                         classname: 'oe_sidebar_' + type[0]
                     }
                 }
-                self.add_section(type[0], type[1], items);
+                self.add_items(type[1], items);
             }
         });
     },
-    add_section: function(code, name, items) {
-        // For each section, we pass a name/label and optionally an array of items.
-        // If no items are passed, then the section will be created as a custom section
-        // returning back an element_id to be used by a custom controller.
-        // Else, the section is a standard section with items displayed as links.
+    
+    add_section: function(name) {
+        var code = _.underscored(name),
+            $section = this.sections[code];
+
+        if(!$section) {
+            section_id = _.uniqueId(this.element_id + '_section_' + code + '_');
+            var $section = $(db.web.qweb.render("Sidebar.section", {
+                section_id: section_id,
+                name: name,
+                classname: 'oe_sidebar_' + code,
+            }));
+            $section.appendTo(this.$element.find('div.sidebar-actions'));
+            this.sections[code] = $section;
+        }
+        return $section;
+    },
+
+    add_items: function(section_name, items) {
         // An item is a dictonary : {
         //    label: label to be displayed for the link,
         //    action: action to be launch when the link is clicked,
@@ -541,25 +601,24 @@ db.web.Sidebar = db.web.Widget.extend({
         //    title: optional title for the link
         // }
         // Note: The item should have one action or/and a callback
+        //
+
         var self = this,
-            section_id = _.uniqueId(this.element_id + '_section_' + code + '_');
+            $section = this.add_section(section_name),
+            section_id = $section.attr('id');
+
         if (items) {
             for (var i = 0; i < items.length; i++) {
                 items[i].element_id = _.uniqueId(section_id + '_item_');
                 this.items[items[i].element_id] = items[i];
             }
-        }
-        var $section = $(db.web.qweb.render("Sidebar.section", {
-            section_id: section_id,
-            name: name,
-            classname: 'oe_sidebar_' + code,
-            items: items
-        }));
-        if (items) {
-            $section.find('a.oe_sidebar_action_a').click(function() {
+
+            var $items = $(db.web.qweb.render("Sidebar.section.items", {items: items}));
+
+            $items.find('a.oe_sidebar_action_a').click(function() {
                 var item = self.items[$(this).attr('id')];
                 if (item.callback) {
-                    item.callback();
+                    item.callback.apply(self, [item]);
                 }
                 if (item.action) {
                     var ids = self.widget_parent.get_selected_ids();
@@ -589,10 +648,13 @@ db.web.Sidebar = db.web.Widget.extend({
                 }
                 return false;
             });
+        
+            var $ul = $section.find('ul');
+            if(!$ul.length) {
+                $ul = $('<ul/>').appendTo($section);
+            }
+            $items.appendTo($ul);
         }
-        $section.appendTo(this.$element.find('div.sidebar-actions'));
-        this.sections[code] = $section;
-        return section_id;
     },
     do_fold: function() {
         this.$element.addClass('closed-sidebar').removeClass('open-sidebar');
@@ -821,42 +883,11 @@ db.web.View = db.web.Widget.extend(/** @lends db.web.View# */{
     },
     do_search: function(view) {
     },
+
     set_common_sidebar_sections: function(sidebar) {
-        sidebar.add_section('customize', "Customize", [
-            {
-                label: "Manage Views",
-                callback: this.on_sidebar_manage_view,
-                title: "Manage views of the current object"
-            }, {
-                label: "Edit Workflow",
-                callback: this.on_sidebar_edit_workflow,
-                title: "Manage views of the current object",
-                classname: 'oe_hide oe_sidebar_edit_workflow'
-            }, {
-                label: "Customize Object",
-                callback: this.on_sidebar_customize_object,
-                title: "Manage views of the current object"
-            }
-        ]);
-        sidebar.add_section('other', "Other Options", [
-            {
-                label: "Import",
-                callback: this.on_sidebar_import
-            }, {
-                label: "Export",
-                callback: this.on_sidebar_export
-            }, {
-                label: "Translate",
-                callback: this.on_sidebar_translate,
-                classname: 'oe_sidebar_translate oe_hide'
-            }, {
-                label: "View Log",
-                callback: this.on_sidebar_view_log,
-                classname: 'oe_hide oe_sidebar_view_log'
-            }
-        ]);
+        sidebar.add_default_sections();
     },
-    on_sidebar_manage_view: function() {
+    on_sidebar_manage_views: function() {
         if (this.fields_view && this.fields_view.arch) {
             $('<xmp>' + db.web.json_node_to_xml(this.fields_view.arch, true) + '</xmp>').dialog({ width: '95%', height: 600});
         } else {
-- 
cgit v1.2.3


From 5d7cf9c8f83b58138fba0fe7bfa8827d8895912a Mon Sep 17 00:00:00 2001
From: Fabien Meghazi <fme@openerp.com>
Date: Wed, 12 Oct 2011 13:09:28 +0200
Subject: [IMP] Reload menu after installation wizardsi

Hardcoded check for action.context.active_model === 'base.module.upgrade' in ir_actions_act_window_close.
If you have a better solution, do not hesitate to propose it

bzr revid: fme@openerp.com-20111012110928-kcjstqt28sh7nhky
---
 addons/web/static/src/js/views.js | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'addons/web/static/src/js/views.js')

diff --git a/addons/web/static/src/js/views.js b/addons/web/static/src/js/views.js
index f996b4149ed..210be479818 100644
--- a/addons/web/static/src/js/views.js
+++ b/addons/web/static/src/js/views.js
@@ -121,6 +121,9 @@ db.web.ActionManager = db.web.Widget.extend({
         if (!this.dialog && on_closed) {
             on_closed();
         }
+        if (this.dialog && action.context && action.context.active_model === 'base.module.upgrade') {
+            db.webclient.menu.reload();
+        }
         this.dialog_stop();
     },
     ir_actions_server: function (action, on_closed) {
-- 
cgit v1.2.3


From 230d99a228f73152c14cfd2e75dbfd8e351e700d Mon Sep 17 00:00:00 2001
From: Fabien Meghazi <fme@openerp.com>
Date: Wed, 12 Oct 2011 13:43:31 +0200
Subject: [IMP] Added condition for menu reloading

bzr revid: fme@openerp.com-20111012114331-7h9hask2nvy0m93d
---
 addons/web/static/src/js/views.js | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

(limited to 'addons/web/static/src/js/views.js')

diff --git a/addons/web/static/src/js/views.js b/addons/web/static/src/js/views.js
index 210be479818..1fa963b5180 100644
--- a/addons/web/static/src/js/views.js
+++ b/addons/web/static/src/js/views.js
@@ -121,8 +121,11 @@ db.web.ActionManager = db.web.Widget.extend({
         if (!this.dialog && on_closed) {
             on_closed();
         }
-        if (this.dialog && action.context && action.context.active_model === 'base.module.upgrade') {
-            db.webclient.menu.reload();
+        if (this.dialog && action.context) {
+            var model = action.context.active_model;
+            if (model === 'base.module.upgrade' || model === 'base.setup.installer') {
+                db.webclient.menu.reload();
+            }
         }
         this.dialog_stop();
     },
-- 
cgit v1.2.3


From 32d2e527fb64a28d8b25260c8e1427068b91319b Mon Sep 17 00:00:00 2001
From: Christophe Simonis <chs@openerp.com>
Date: Wed, 12 Oct 2011 11:54:26 +0200
Subject: [FIX] explicitly provide the code of sidebar sections

bzr revid: chs@openerp.com-20111012095426-qb3see19uic61jr1
---
 addons/web/static/src/js/views.js | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

(limited to 'addons/web/static/src/js/views.js')

diff --git a/addons/web/static/src/js/views.js b/addons/web/static/src/js/views.js
index 50ffb4bbbc5..5837431530c 100644
--- a/addons/web/static/src/js/views.js
+++ b/addons/web/static/src/js/views.js
@@ -522,7 +522,8 @@ db.web.Sidebar = db.web.Widget.extend({
     },
 
     add_default_sections: function() {
-        this.add_items('Customize', [
+        this.add_section('Customize', 'customize');
+        this.add_items('customize', [
             {
                 label: "Manage Views",
                 callback: this.call_default_on_sidebar,
@@ -539,7 +540,8 @@ db.web.Sidebar = db.web.Widget.extend({
             }
         ]);
 
-        this.add_items('Other Options', [ 
+        this.add_section('Other Options', 'other');
+        this.add_items('other', [ 
             {
                 label: "Import",
                 callback: this.call_default_on_sidebar,
@@ -570,14 +572,15 @@ db.web.Sidebar = db.web.Widget.extend({
                         classname: 'oe_sidebar_' + type[0]
                     }
                 }
-                self.add_items(type[1], items);
+                self.add_section(type[1], type[0]);
+                self.add_items(type[0], items);
             }
         });
     },
     
-    add_section: function(name) {
-        var code = _.underscored(name),
-            $section = this.sections[code];
+    add_section: function(name, code) {
+        if(!code) code = _.userscored(name);
+        var $section = this.sections[code];
 
         if(!$section) {
             section_id = _.uniqueId(this.element_id + '_section_' + code + '_');
@@ -592,7 +595,7 @@ db.web.Sidebar = db.web.Widget.extend({
         return $section;
     },
 
-    add_items: function(section_name, items) {
+    add_items: function(section_code, items) {
         // An item is a dictonary : {
         //    label: label to be displayed for the link,
         //    action: action to be launch when the link is clicked,
@@ -604,7 +607,7 @@ db.web.Sidebar = db.web.Widget.extend({
         //
 
         var self = this,
-            $section = this.add_section(section_name),
+            $section = this.add_section(_.titleize(section_code.replace('_', ' ')), section_code),
             section_id = $section.attr('id');
 
         if (items) {
-- 
cgit v1.2.3


From 1dfd69590d49db4ff8730ad656230ec921edba62 Mon Sep 17 00:00:00 2001
From: Christophe Simonis <chs@openerp.com>
Date: Wed, 12 Oct 2011 12:18:02 +0200
Subject: [IMP] _t() sidebar

bzr revid: chs@openerp.com-20111012101802-fdrjaj80x03hx7xz
---
 addons/web/static/src/js/views.js | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

(limited to 'addons/web/static/src/js/views.js')

diff --git a/addons/web/static/src/js/views.js b/addons/web/static/src/js/views.js
index 5837431530c..b4f65023e11 100644
--- a/addons/web/static/src/js/views.js
+++ b/addons/web/static/src/js/views.js
@@ -522,38 +522,38 @@ db.web.Sidebar = db.web.Widget.extend({
     },
 
     add_default_sections: function() {
-        this.add_section('Customize', 'customize');
+        this.add_section(_t('Customize'), 'customize');
         this.add_items('customize', [
             {
-                label: "Manage Views",
+                label: _t("Manage Views"),
                 callback: this.call_default_on_sidebar,
-                title: "Manage views of the current object"
+                title: _t("Manage views of the current object"),
             }, {
-                label: "Edit Workflow",
+                label: _t("Edit Workflow"),
                 callback: this.call_default_on_sidebar,
-                title: "Manage views of the current object",
+                title: _t("Manage views of the current object"),
                 classname: 'oe_hide oe_sidebar_edit_workflow'
             }, {
-                label: "Customize Object",
+                label: _t("Customize Object"),
                 callback: this.call_default_on_sidebar,
-                title: "Manage views of the current object"
+                title: _t("Manage views of the current object"),
             }
         ]);
 
-        this.add_section('Other Options', 'other');
+        this.add_section(_t('Other Options'), 'other');
         this.add_items('other', [ 
             {
-                label: "Import",
+                label: _t("Import"),
                 callback: this.call_default_on_sidebar,
             }, {
-                label: "Export",
+                label: _t("Export"),
                 callback: this.call_default_on_sidebar,
             }, {
-                label: "Translate",
+                label: _t("Translate"),
                 callback: this.call_default_on_sidebar,
                 classname: 'oe_sidebar_translate oe_hide'
             }, {
-                label: "View Log",
+                label: _t("View Log"),
                 callback: this.call_default_on_sidebar,
                 classname: 'oe_hide oe_sidebar_view_log'
             }
@@ -562,7 +562,7 @@ db.web.Sidebar = db.web.Widget.extend({
 
     add_toolbar: function(toolbar) {
         var self = this;
-        _.each([['print', "Reports"], ['action', "Actions"], ['relate', "Links"]], function(type) {
+        _.each([['print', _t("Reports")], ['action', _t("Actions")], ['relate', _t("Links")]], function(type) {
             var items = toolbar[type[0]];
             if (items.length) {
                 for (var i = 0; i < items.length; i++) {
-- 
cgit v1.2.3


From 378a9de3e861f121e715278ef863fdc924ea3f3f Mon Sep 17 00:00:00 2001
From: Christophe Simonis <chs@openerp.com>
Date: Wed, 12 Oct 2011 14:26:22 +0200
Subject: [FIX] hum hum

bzr revid: chs@openerp.com-20111012122622-dcuhelpcgv119s6g
---
 addons/web/static/src/js/views.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'addons/web/static/src/js/views.js')

diff --git a/addons/web/static/src/js/views.js b/addons/web/static/src/js/views.js
index b4f65023e11..91ac8f39031 100644
--- a/addons/web/static/src/js/views.js
+++ b/addons/web/static/src/js/views.js
@@ -579,7 +579,7 @@ db.web.Sidebar = db.web.Widget.extend({
     },
     
     add_section: function(name, code) {
-        if(!code) code = _.userscored(name);
+        if(!code) code = _.underscored(name);
         var $section = this.sections[code];
 
         if(!$section) {
-- 
cgit v1.2.3


From a58395f2af3181bf94738a6cfcfa7c691172437a Mon Sep 17 00:00:00 2001
From: Christophe Simonis <chs@openerp.com>
Date: Thu, 13 Oct 2011 10:14:45 +0200
Subject: [FIX] do no load the menu until a session is active [IMP] make menu
 loading hookable

bzr revid: chs@openerp.com-20111013081445-1xzvodzrtxvacbzz
---
 addons/web/static/src/js/views.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'addons/web/static/src/js/views.js')

diff --git a/addons/web/static/src/js/views.js b/addons/web/static/src/js/views.js
index 593e5cab116..006213086be 100644
--- a/addons/web/static/src/js/views.js
+++ b/addons/web/static/src/js/views.js
@@ -124,7 +124,7 @@ db.web.ActionManager = db.web.Widget.extend({
         if (this.dialog && action.context) {
             var model = action.context.active_model;
             if (model === 'base.module.upgrade' || model === 'base.setup.installer') {
-                db.webclient.menu.reload();
+                db.webclient.menu.do_reload();
             }
         }
         this.dialog_stop();
-- 
cgit v1.2.3


From 00b269d1c0a3507a01a296587e96bcb9e8e6da86 Mon Sep 17 00:00:00 2001
From: Christophe Simonis <chs@openerp.com>
Date: Thu, 13 Oct 2011 12:26:53 +0200
Subject: [IMP] nivification of Notification Widget

bzr revid: chs@openerp.com-20111013102653-wox1v4o9mfplzt2b
---
 addons/web/static/src/js/views.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'addons/web/static/src/js/views.js')

diff --git a/addons/web/static/src/js/views.js b/addons/web/static/src/js/views.js
index 006213086be..a26063c1fc7 100644
--- a/addons/web/static/src/js/views.js
+++ b/addons/web/static/src/js/views.js
@@ -902,7 +902,7 @@ db.web.View = db.web.Widget.extend(/** @lends db.web.View# */{
         if (this.fields_view && this.fields_view.arch) {
             $('<xmp>' + db.web.json_node_to_xml(this.fields_view.arch, true) + '</xmp>').dialog({ width: '95%', height: 600});
         } else {
-            this.notification.warn("Manage Views", "Could not find current view declaration");
+            this.do_warn("Manage Views", "Could not find current view declaration");
         }
     },
     on_sidebar_edit_workflow: function() {
-- 
cgit v1.2.3


From 57d635f44df6767c849bfaf6e8e9c27a31e9cfa3 Mon Sep 17 00:00:00 2001
From: Antony Lesuisse <al@openerp.com>
Date: Fri, 14 Oct 2011 01:20:54 +0200
Subject: [FIX] soft reload after module installation

lp bug: https://launchpad.net/bugs/873362 fixed

bzr revid: al@openerp.com-20111013232054-2i5ptzfurjc429zw
---
 addons/web/static/src/js/views.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'addons/web/static/src/js/views.js')

diff --git a/addons/web/static/src/js/views.js b/addons/web/static/src/js/views.js
index 006213086be..cfeb1aa730b 100644
--- a/addons/web/static/src/js/views.js
+++ b/addons/web/static/src/js/views.js
@@ -123,8 +123,8 @@ db.web.ActionManager = db.web.Widget.extend({
         }
         if (this.dialog && action.context) {
             var model = action.context.active_model;
-            if (model === 'base.module.upgrade' || model === 'base.setup.installer') {
-                db.webclient.menu.do_reload();
+            if (model === 'base.module.upgrade' || model === 'base.setup.installer' || model === 'base.module.upgrade') {
+                db.webclient.do_reload();
             }
         }
         this.dialog_stop();
-- 
cgit v1.2.3


From 679983672d9afe72e6a19494598b8eb558dcd8cc Mon Sep 17 00:00:00 2001
From: Fabien Meghazi <fme@openerp.com>
Date: Tue, 18 Oct 2011 13:50:40 +0200
Subject: [FIX] Action buttons does not include active_id in context when
 loading action

lp bug: https://launchpad.net/bugs/871771 fixed

bzr revid: fme@openerp.com-20111018115040-66l0xiudl8yt8khq
---
 addons/web/static/src/js/views.js | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

(limited to 'addons/web/static/src/js/views.js')

diff --git a/addons/web/static/src/js/views.js b/addons/web/static/src/js/views.js
index 32e17db641f..4094d1019bb 100644
--- a/addons/web/static/src/js/views.js
+++ b/addons/web/static/src/js/views.js
@@ -854,15 +854,19 @@ db.web.View = db.web.Widget.extend(/** @lends db.web.View# */{
                 return self.widget_parent.on_action_executed.apply(null, arguments);
             }
         };
+        var context = new db.web.CompoundContext(dataset.get_context());
+        if (record_id) {
+            context.add({
+                active_id: record_id,
+                active_ids: [record_id],
+                active_model: dataset.model
+            });
+        }
         var handler = function (r) {
             var action = r.result;
             if (action && action.constructor == Object) {
                 return self.rpc('/web/session/eval_domain_and_context', {
-                    contexts: [dataset.get_context(), action.context || {}, {
-                        active_id: record_id || false,
-                        active_ids: [record_id || false],
-                        active_model: dataset.model
-                    }],
+                    contexts: [context, action.context || {}],
                     domains: []
                 }).pipe(function (results) {
                     if (!action_data.context) {
@@ -878,8 +882,6 @@ db.web.View = db.web.Widget.extend(/** @lends db.web.View# */{
             }
         };
 
-        var context = new db.web.CompoundContext(dataset.get_context(), action_data.context || {});
-
         if (action_data.special) {
             return handler({result: {"type":"ir.actions.act_window_close"}});
         } else if (action_data.type=="object") {
-- 
cgit v1.2.3


From 29f2f28afe17b2722630fd539278427f284b26fd Mon Sep 17 00:00:00 2001
From: Fabien Meghazi <fme@openerp.com>
Date: Tue, 18 Oct 2011 17:15:34 +0200
Subject: [REV] Revert Rev.1290: Breaks more than it fixes

bzr revid: fme@openerp.com-20111018151534-3w5ms47i8yj48gpq
---
 addons/web/static/src/js/views.js | 16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)

(limited to 'addons/web/static/src/js/views.js')

diff --git a/addons/web/static/src/js/views.js b/addons/web/static/src/js/views.js
index 4094d1019bb..32e17db641f 100644
--- a/addons/web/static/src/js/views.js
+++ b/addons/web/static/src/js/views.js
@@ -854,19 +854,15 @@ db.web.View = db.web.Widget.extend(/** @lends db.web.View# */{
                 return self.widget_parent.on_action_executed.apply(null, arguments);
             }
         };
-        var context = new db.web.CompoundContext(dataset.get_context());
-        if (record_id) {
-            context.add({
-                active_id: record_id,
-                active_ids: [record_id],
-                active_model: dataset.model
-            });
-        }
         var handler = function (r) {
             var action = r.result;
             if (action && action.constructor == Object) {
                 return self.rpc('/web/session/eval_domain_and_context', {
-                    contexts: [context, action.context || {}],
+                    contexts: [dataset.get_context(), action.context || {}, {
+                        active_id: record_id || false,
+                        active_ids: [record_id || false],
+                        active_model: dataset.model
+                    }],
                     domains: []
                 }).pipe(function (results) {
                     if (!action_data.context) {
@@ -882,6 +878,8 @@ db.web.View = db.web.Widget.extend(/** @lends db.web.View# */{
             }
         };
 
+        var context = new db.web.CompoundContext(dataset.get_context(), action_data.context || {});
+
         if (action_data.special) {
             return handler({result: {"type":"ir.actions.act_window_close"}});
         } else if (action_data.type=="object") {
-- 
cgit v1.2.3


From 6ce8a18fbe9c5273b79f3f5f5e079417f9acf404 Mon Sep 17 00:00:00 2001
From: niv-openerp <nicolas.vanhoren@openerp.com>
Date: Tue, 18 Oct 2011 17:57:33 +0200
Subject: [fix] context problem in accounting

lp bug: https://launchpad.net/bugs/871771 fixed

bzr revid: nicolas.vanhoren@openerp.com-20111018155733-45xhk7hg2xsmj26h
---
 addons/web/static/src/js/views.js | 30 ++++++++++++++++--------------
 1 file changed, 16 insertions(+), 14 deletions(-)

(limited to 'addons/web/static/src/js/views.js')

diff --git a/addons/web/static/src/js/views.js b/addons/web/static/src/js/views.js
index 32e17db641f..9aecbd475af 100644
--- a/addons/web/static/src/js/views.js
+++ b/addons/web/static/src/js/views.js
@@ -854,23 +854,27 @@ db.web.View = db.web.Widget.extend(/** @lends db.web.View# */{
                 return self.widget_parent.on_action_executed.apply(null, arguments);
             }
         };
+        var context = new db.web.CompoundContext(dataset.get_context(), action_data.context || {});
+        
         var handler = function (r) {
             var action = r.result;
             if (action && action.constructor == Object) {
-                return self.rpc('/web/session/eval_domain_and_context', {
-                    contexts: [dataset.get_context(), action.context || {}, {
-                        active_id: record_id || false,
-                        active_ids: [record_id || false],
+                var ncontext = new db.web.CompoundContext(context, action.context || {});
+                if (record_id) {
+                    ncontext.add({
+                        active_id: record_id,
+                        active_ids: [record_id],
                         active_model: dataset.model
-                    }],
+                    });
+                }
+                return self.rpc('/web/session/eval_domain_and_context', {
+                    contexts: [ncontext],
                     domains: []
                 }).pipe(function (results) {
-                    if (!action_data.context) {
-                        action.context = results.context
-                    } else {
-                        action.context = new db.web.CompoundContext(
-                            results.context, action_data.context);
-                    }
+                    action.context = results.context;
+                    /* niv: previously we were overriding once more with action_data.context,
+                     * I assumed this was not a correct behavior and removed it
+                     */
                     return self.do_action(action, result_handler);
                 }, null);
             } else {
@@ -878,14 +882,12 @@ db.web.View = db.web.Widget.extend(/** @lends db.web.View# */{
             }
         };
 
-        var context = new db.web.CompoundContext(dataset.get_context(), action_data.context || {});
-
         if (action_data.special) {
             return handler({result: {"type":"ir.actions.act_window_close"}});
         } else if (action_data.type=="object") {
             return dataset.call_button(action_data.name, [[record_id], context], handler);
         } else if (action_data.type=="action") {
-            return this.rpc('/web/action/load', { action_id: parseInt(action_data.name, 10), context: context }, handler);
+            return this.rpc('/web/action/load', { action_id: parseInt(action_data.name, 10), context: context, do_not_eval: true}, handler);
         } else  {
             return dataset.exec_workflow(record_id, action_data.name, handler);
         }
-- 
cgit v1.2.3


From 9d9476b981dd200f8c0c65a728b6b86ac840e364 Mon Sep 17 00:00:00 2001
From: niv-openerp <nicolas.vanhoren@openerp.com>
Date: Wed, 19 Oct 2011 11:56:12 +0200
Subject: [fix] potential problem in contexts an button actions

bzr revid: nicolas.vanhoren@openerp.com-20111019095612-y7lw6o2lbfngdga5
---
 addons/web/static/src/js/views.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'addons/web/static/src/js/views.js')

diff --git a/addons/web/static/src/js/views.js b/addons/web/static/src/js/views.js
index 9aecbd475af..a2be0dfcaeb 100644
--- a/addons/web/static/src/js/views.js
+++ b/addons/web/static/src/js/views.js
@@ -859,7 +859,7 @@ db.web.View = db.web.Widget.extend(/** @lends db.web.View# */{
         var handler = function (r) {
             var action = r.result;
             if (action && action.constructor == Object) {
-                var ncontext = new db.web.CompoundContext(context, action.context || {});
+                var ncontext = new db.web.CompoundContext(context);
                 if (record_id) {
                     ncontext.add({
                         active_id: record_id,
@@ -867,6 +867,7 @@ db.web.View = db.web.Widget.extend(/** @lends db.web.View# */{
                         active_model: dataset.model
                     });
                 }
+                ncontext.add(action.context || {});
                 return self.rpc('/web/session/eval_domain_and_context', {
                     contexts: [ncontext],
                     domains: []
-- 
cgit v1.2.3


From 75c4b66589f48b4a1b72a99c321d272aa80f2158 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Wed, 19 Oct 2011 14:56:04 +0200
Subject: [ADD] act_url support

bzr revid: xmo@openerp.com-20111019125604-e290rwdpme44wqc8
---
 addons/web/static/src/js/views.js | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'addons/web/static/src/js/views.js')

diff --git a/addons/web/static/src/js/views.js b/addons/web/static/src/js/views.js
index a2be0dfcaeb..f402a51bf7e 100644
--- a/addons/web/static/src/js/views.js
+++ b/addons/web/static/src/js/views.js
@@ -158,6 +158,9 @@ db.web.ActionManager = db.web.Widget.extend({
                 complete: $.unblockUI
             });
         });
+    },
+    ir_actions_act_url: function (action) {
+        window.open(action.url, action.target === 'self' ? '_self' : '_blank');
     }
 });
 
-- 
cgit v1.2.3


From f097e140b8b51437258ae03000b37f1677f6098b Mon Sep 17 00:00:00 2001
From: Antony Lesuisse <al@openerp.com>
Date: Tue, 25 Oct 2011 00:54:31 +0200
Subject: [IMP] try session instead of openerp,db and we would rename Session
 into Connection

bzr revid: al@openerp.com-20111024225431-g9eaqophnw3k8hh4
---
 addons/web/static/src/js/views.js | 86 +++++++++++++++++++--------------------
 1 file changed, 43 insertions(+), 43 deletions(-)

(limited to 'addons/web/static/src/js/views.js')

diff --git a/addons/web/static/src/js/views.js b/addons/web/static/src/js/views.js
index f402a51bf7e..b7a3d185bc1 100644
--- a/addons/web/static/src/js/views.js
+++ b/addons/web/static/src/js/views.js
@@ -2,21 +2,21 @@
  * OpenERP web library
  *---------------------------------------------------------*/
 
-openerp.web.views = function(db) {
+openerp.web.views = function(session) {
 
-var _t = db.web._t;
+var _t = session.web._t;
 
 /**
  * Registry for all the client actions key: tag value: widget
  */
-db.web.client_actions = new db.web.Registry();
+session.web.client_actions = new session.web.Registry();
 
 /**
  * Registry for all the main views
  */
-db.web.views = new db.web.Registry();
+session.web.views = new session.web.Registry();
 
-db.web.ActionManager = db.web.Widget.extend({
+session.web.ActionManager = session.web.Widget.extend({
     identifier_prefix: "actionmanager",
     init: function(parent) {
         this._super(parent);
@@ -93,20 +93,20 @@ db.web.ActionManager = db.web.Widget.extend({
     ir_actions_act_window: function (action, on_close) {
         if (action.target === 'new') {
             if (this.dialog == null) {
-                this.dialog = new db.web.Dialog(this, { title: action.name, width: '80%' });
+                this.dialog = new session.web.Dialog(this, { title: action.name, width: '80%' });
                 if(on_close)
                     this.dialog.on_close.add(on_close);
                 this.dialog.start();
             } else {
                 this.dialog_viewmanager.stop();
             }
-            this.dialog_viewmanager = new db.web.ViewManagerAction(this, action);
+            this.dialog_viewmanager = new session.web.ViewManagerAction(this, action);
             this.dialog_viewmanager.appendTo(this.dialog.$element);
             this.dialog.open();
         } else  {
             this.dialog_stop();
             this.content_stop();
-            this.inner_viewmanager = new db.web.ViewManagerAction(this, action);
+            this.inner_viewmanager = new session.web.ViewManagerAction(this, action);
             this.inner_viewmanager.appendTo(this.$element);
             this.url_update(action);
         }
@@ -124,7 +124,7 @@ db.web.ActionManager = db.web.Widget.extend({
         if (this.dialog && action.context) {
             var model = action.context.active_model;
             if (model === 'base.module.upgrade' || model === 'base.setup.installer' || model === 'base.module.upgrade') {
-                db.webclient.do_reload();
+                session.webclient.do_reload();
             }
         }
         this.dialog_stop();
@@ -140,7 +140,7 @@ db.web.ActionManager = db.web.Widget.extend({
     },
     ir_actions_client: function (action) {
         this.content_stop();
-        var ClientWidget = db.web.client_actions.get_object(action.tag);
+        var ClientWidget = session.web.client_actions.get_object(action.tag);
         (this.client_widget = new ClientWidget(this, action.params)).appendTo(this);
     },
     ir_actions_report_xml: function(action) {
@@ -164,12 +164,12 @@ db.web.ActionManager = db.web.Widget.extend({
     }
 });
 
-db.web.ViewManager =  db.web.Widget.extend(/** @lends db.web.ViewManager# */{
+session.web.ViewManager =  session.web.Widget.extend(/** @lends session.web.ViewManager# */{
     identifier_prefix: "viewmanager",
     template: "ViewManager",
     /**
-     * @constructs db.web.ViewManager
-     * @extends db.web.Widget
+     * @constructs session.web.ViewManager
+     * @extends session.web.Widget
      *
      * @param parent
      * @param dataset
@@ -185,10 +185,10 @@ db.web.ViewManager =  db.web.Widget.extend(/** @lends db.web.ViewManager# */{
         this.views_src = _.map(views, function(x) {return x instanceof Array? {view_id: x[0], view_type: x[1]} : x;});
         this.views = {};
         this.flags = this.flags || {};
-        this.registry = db.web.views;
+        this.registry = session.web.views;
     },
     render: function() {
-        return db.web.qweb.render(this.template, {
+        return session.web.qweb.render(this.template, {
             self: this,
             prefix: this.element_id,
             views: this.views_src});
@@ -284,7 +284,7 @@ db.web.ViewManager =  db.web.Widget.extend(/** @lends db.web.ViewManager# */{
         if (this.searchview) {
             this.searchview.stop();
         }
-        this.searchview = new db.web.SearchView(
+        this.searchview = new session.web.SearchView(
                 this, this.dataset,
                 view_id, search_defaults, this.flags.search_view === false);
 
@@ -334,13 +334,13 @@ db.web.ViewManager =  db.web.Widget.extend(/** @lends db.web.ViewManager# */{
     on_action_executed: function () {}
 });
 
-db.web.ViewManagerAction = db.web.ViewManager.extend(/** @lends oepnerp.web.ViewManagerAction# */{
+session.web.ViewManagerAction = session.web.ViewManager.extend(/** @lends oepnerp.web.ViewManagerAction# */{
     template:"ViewManagerAction",
     /**
-     * @constructs db.web.ViewManagerAction
-     * @extends db.web.ViewManager
+     * @constructs session.web.ViewManagerAction
+     * @extends session.web.ViewManager
      *
-     * @param {db.web.ActionManager} parent parent object/widget
+     * @param {session.web.ActionManager} parent parent object/widget
      * @param {Object} action descriptor for the action this viewmanager needs to manage its views.
      */
     init: function(parent, action) {
@@ -350,7 +350,7 @@ db.web.ViewManagerAction = db.web.ViewManager.extend(/** @lends oepnerp.web.View
         this._super(parent, null, action.views);
         this.session = parent.session;
         this.action = action;
-        var dataset = new db.web.DataSetSearch(this, action.res_model, action.context, action.domain);
+        var dataset = new session.web.DataSetSearch(this, action.res_model, action.context, action.domain);
         if (action.res_id) {
             dataset.ids.push(action.res_id);
             dataset.index = 0;
@@ -400,12 +400,12 @@ db.web.ViewManagerAction = db.web.ViewManager.extend(/** @lends oepnerp.web.View
 
         this.$element.find('.oe_get_xml_view').click(function () {
             // TODO: add search view?
-            $('<pre>').text(db.web.json_node_to_xml(
+            $('<pre>').text(session.web.json_node_to_xml(
                 self.views[self.active_view].controller.fields_view.arch, true))
                     .dialog({ width: '95%'});
         });
         if (this.action.help && !this.flags.low_profile) {
-            var Users = new db.web.DataSet(self, 'res.users'),
+            var Users = new session.web.DataSet(self, 'res.users'),
                 header = this.$element.find('.oe-view-manager-header');
             header.delegate('blockquote button', 'click', function() {
                 var $this = $(this);
@@ -451,7 +451,7 @@ db.web.ViewManagerAction = db.web.ViewManager.extend(/** @lends oepnerp.web.View
         var grandparent = this.widget_parent && this.widget_parent.widget_parent;
         // display shortcuts if on the first view for the action
         var $shortcut_toggle = this.$element.find('.oe-shortcut-toggle');
-        if (!(grandparent instanceof db.web.WebClient) ||
+        if (!(grandparent instanceof session.web.WebClient) ||
             !(view.view_type === this.views_src[0].view_type
                 && view.view_id === this.views_src[0].view_id)) {
             $shortcut_toggle.hide();
@@ -488,7 +488,7 @@ db.web.ViewManagerAction = db.web.ViewManager.extend(/** @lends oepnerp.web.View
      * Intercept do_action resolution from children views
      */
     on_action_executed: function () {
-        return new db.web.DataSet(this, 'res.log')
+        return new session.web.DataSet(this, 'res.log')
                 .call('get', [], this.do_display_log);
     },
     /**
@@ -515,7 +515,7 @@ db.web.ViewManagerAction = db.web.ViewManager.extend(/** @lends oepnerp.web.View
     }
 });
 
-db.web.Sidebar = db.web.Widget.extend({
+session.web.Sidebar = session.web.Widget.extend({
     init: function(parent, element_id) {
         this._super(parent, element_id);
         this.items = {};
@@ -524,7 +524,7 @@ db.web.Sidebar = db.web.Widget.extend({
     start: function() {
         this._super(this);
         var self = this;
-        this.$element.html(db.web.qweb.render('Sidebar'));
+        this.$element.html(session.web.qweb.render('Sidebar'));
         this.$element.find(".toggle-sidebar").click(function(e) {
             self.do_toggle();
         });
@@ -601,7 +601,7 @@ db.web.Sidebar = db.web.Widget.extend({
 
         if(!$section) {
             section_id = _.uniqueId(this.element_id + '_section_' + code + '_');
-            var $section = $(db.web.qweb.render("Sidebar.section", {
+            var $section = $(session.web.qweb.render("Sidebar.section", {
                 section_id: section_id,
                 name: name,
                 classname: 'oe_sidebar_' + code,
@@ -633,7 +633,7 @@ db.web.Sidebar = db.web.Widget.extend({
                 this.items[items[i].element_id] = items[i];
             }
 
-            var $items = $(db.web.qweb.render("Sidebar.section.items", {items: items}));
+            var $items = $(session.web.qweb.render("Sidebar.section.items", {items: items}));
 
             $items.find('a.oe_sidebar_action_a').click(function() {
                 var item = self.items[$(this).attr('id')];
@@ -687,7 +687,7 @@ db.web.Sidebar = db.web.Widget.extend({
     }
 });
 
-db.web.TranslateDialog = db.web.Dialog.extend({
+session.web.TranslateDialog = session.web.Dialog.extend({
     dialog_title: _t("Translations"),
     init: function(view) {
         // TODO fme: should add the language to fields_view_get because between the fields view get
@@ -707,14 +707,14 @@ db.web.TranslateDialog = db.web.Dialog.extend({
         this.translatable_fields_keys = _.map(this.view.translatable_fields || [], function(i) { return i.name });
         this.languages = null;
         this.languages_loaded = $.Deferred();
-        (new db.web.DataSetSearch(this, 'res.lang', this.view.dataset.get_context(),
+        (new session.web.DataSetSearch(this, 'res.lang', this.view.dataset.get_context(),
             [['translatable', '=', '1']])).read_slice(['code', 'name'], { sort: 'id' }, this.on_languages_loaded);
     },
     start: function() {
         var self = this;
         this._super();
         $.when(this.languages_loaded).then(function() {
-            self.$element.html(db.web.qweb.render('TranslateDialog', { widget: self }));
+            self.$element.html(session.web.qweb.render('TranslateDialog', { widget: self }));
             self.$element.tabs();
             if (!(self.view.translatable_fields && self.view.translatable_fields.length)) {
                 self.hide_tabs('fields');
@@ -819,7 +819,7 @@ db.web.TranslateDialog = db.web.Dialog.extend({
     }
 });
 
-db.web.View = db.web.Widget.extend(/** @lends db.web.View# */{
+session.web.View = session.web.Widget.extend(/** @lends session.web.View# */{
     template: "EmptyComponent",
     set_default_options: function(options) {
         this.options = options || {};
@@ -833,7 +833,7 @@ db.web.View = db.web.Widget.extend(/** @lends db.web.View# */{
     },
     open_translate_dialog: function(field) {
         if (!this.translate_dialog) {
-            this.translate_dialog = new db.web.TranslateDialog(this).start();
+            this.translate_dialog = new session.web.TranslateDialog(this).start();
         }
         this.translate_dialog.open(field);
     },
@@ -845,7 +845,7 @@ db.web.View = db.web.Widget.extend(/** @lends db.web.View# */{
      * @param {String} [action_data.special=null] special action handlers (currently: only ``'cancel'``)
      * @param {String} [action_data.type='workflow'] the action type, if present, one of ``'object'``, ``'action'`` or ``'workflow'``
      * @param {Object} [action_data.context=null] additional action context, to add to the current context
-     * @param {db.web.DataSet} dataset a dataset object used to communicate with the server
+     * @param {session.web.DataSet} dataset a dataset object used to communicate with the server
      * @param {Object} [record_id] the identifier of the object on which the action is to be applied
      * @param {Function} on_closed callback to execute when dialog is closed or when the action does not generate any result (no new action)
      */
@@ -857,12 +857,12 @@ db.web.View = db.web.Widget.extend(/** @lends db.web.View# */{
                 return self.widget_parent.on_action_executed.apply(null, arguments);
             }
         };
-        var context = new db.web.CompoundContext(dataset.get_context(), action_data.context || {});
+        var context = new session.web.CompoundContext(dataset.get_context(), action_data.context || {});
         
         var handler = function (r) {
             var action = r.result;
             if (action && action.constructor == Object) {
-                var ncontext = new db.web.CompoundContext(context);
+                var ncontext = new session.web.CompoundContext(context);
                 if (record_id) {
                     ncontext.add({
                         active_id: record_id,
@@ -899,7 +899,7 @@ db.web.View = db.web.Widget.extend(/** @lends db.web.View# */{
     /**
      * Directly set a view to use instead of calling fields_view_get. This method must
      * be called before start(). When an embedded view is set, underlying implementations
-     * of db.web.View must use the provided view instead of any other one.
+     * of session.web.View must use the provided view instead of any other one.
      *
      * @param embedded_view A view.
      */
@@ -917,7 +917,7 @@ db.web.View = db.web.Widget.extend(/** @lends db.web.View# */{
     },
     on_sidebar_manage_views: function() {
         if (this.fields_view && this.fields_view.arch) {
-            $('<xmp>' + db.web.json_node_to_xml(this.fields_view.arch, true) + '</xmp>').dialog({ width: '95%', height: 600});
+            $('<xmp>' + session.web.json_node_to_xml(this.fields_view.arch, true) + '</xmp>').dialog({ width: '95%', height: 600});
         } else {
             this.do_warn("Manage Views", "Could not find current view declaration");
         }
@@ -929,11 +929,11 @@ db.web.View = db.web.Widget.extend(/** @lends db.web.View# */{
         console.log('Todo');
     },
     on_sidebar_import: function() {
-        var import_view = new db.web.DataImport(this, this.dataset);
+        var import_view = new session.web.DataImport(this, this.dataset);
         import_view.start();
     },
     on_sidebar_export: function() {
-        var export_view = new db.web.DataExport(this, this.dataset);
+        var export_view = new session.web.DataExport(this, this.dataset);
         export_view.start();
     },
     on_sidebar_translate: function() {
@@ -943,7 +943,7 @@ db.web.View = db.web.Widget.extend(/** @lends db.web.View# */{
     }
 });
 
-db.web.json_node_to_xml = function(node, single_quote, indent) {
+session.web.json_node_to_xml = function(node, single_quote, indent) {
     // For debugging purpose, this function will convert a json node back to xml
     // Maybe usefull for xml view editor
 
@@ -972,7 +972,7 @@ db.web.json_node_to_xml = function(node, single_quote, indent) {
         r += '>\n';
         var childs = [];
         for (var i = 0, ii = node.children.length; i < ii; i++) {
-            childs.push(db.web.json_node_to_xml(node.children[i], single_quote, indent + 1));
+            childs.push(session.web.json_node_to_xml(node.children[i], single_quote, indent + 1));
         }
         r += childs.join('\n');
         r += '\n' + sindent + '</' + node.tag + '>';
-- 
cgit v1.2.3


From 96339d71609b4e51b59341026cb1882abe16ed56 Mon Sep 17 00:00:00 2001
From: "Yogesh (OpenERP)" <ysa@tinyerp.com>
Date: Tue, 25 Oct 2011 12:13:23 +0530
Subject: [FIX]

bzr revid: ysa@tinyerp.com-20111025064323-ds0o146bi1r83kd5
---
 addons/web/static/src/js/views.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'addons/web/static/src/js/views.js')

diff --git a/addons/web/static/src/js/views.js b/addons/web/static/src/js/views.js
index afcc87a40a7..10e53efa591 100644
--- a/addons/web/static/src/js/views.js
+++ b/addons/web/static/src/js/views.js
@@ -917,7 +917,7 @@ session.web.View = session.web.Widget.extend(/** @lends session.web.View# */{
     },
     on_sidebar_manage_views: function() {
         if (this.fields_view && this.fields_view.arch) {
-            var view_editor = new db.web.ViewEditor(this, this.$element, this.dataset, this.fields_view.arch);
+            var view_editor = new session.web.ViewEditor(this, this.$element, this.dataset, this.fields_view.arch);
             view_editor.start();
         } else {
             this.do_warn("Manage Views", "Could not find current view declaration");
-- 
cgit v1.2.3