From 95bd1d12370ed6df3741204a9dc874639da0ba5f Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Thu, 31 Mar 2011 15:43:46 +0200
Subject: [PATCH 1/9] [IMP] have action manager correctly stop the view manager

bzr revid: xmo@openerp.com-20110331134346-bn5fuq62ypcjs0fz
---
 addons/base/static/src/js/views.js | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/addons/base/static/src/js/views.js b/addons/base/static/src/js/views.js
index b0b79c3e5f7..438f9fac3e4 100644
--- a/addons/base/static/src/js/views.js
+++ b/addons/base/static/src/js/views.js
@@ -18,7 +18,12 @@ openerp.base.ActionManager = openerp.base.Controller.extend({
     do_action: function(action) {
         // instantiate the right controllers by understanding the action
         this.action = action;
+        // TODO: handle target=new
+        console.log(action);
         if(action.type == "ir.actions.act_window") {
+            if (this.viewmanager) {
+                this.viewmanager.stop();
+            }
             this.viewmanager = new openerp.base.ViewManager(this.session,this.element_id);
             this.viewmanager.do_action_window(action);
             this.viewmanager.start();

From 16d580a5732ea13312d295183110cfd17eea461d Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Thu, 31 Mar 2011 16:54:32 +0200
Subject: [PATCH 2/9] [FIX] generify view management using a registry

bzr revid: xmo@openerp.com-20110331145432-qg0kigi1xtgxvk1i
---
 addons/base/static/src/js/form.js   |  1 +
 addons/base/static/src/js/list.js   |  1 +
 addons/base/static/src/js/views.js  | 89 ++++++++++++++++-------------
 addons/base/static/src/xml/base.xml |  4 +-
 4 files changed, 53 insertions(+), 42 deletions(-)

diff --git a/addons/base/static/src/js/form.js b/addons/base/static/src/js/form.js
index 9c0f8e9bf6b..3bca7be030d 100644
--- a/addons/base/static/src/js/form.js
+++ b/addons/base/static/src/js/form.js
@@ -1,6 +1,7 @@
 
 openerp.base.form = function (openerp) {
 
+openerp.base.views.add('form', 'openerp.base.FormView');
 openerp.base.FormView =  openerp.base.Controller.extend({
     init: function(session, element_id, dataset, view_id) {
         this._super(session, element_id);
diff --git a/addons/base/static/src/js/list.js b/addons/base/static/src/js/list.js
index f572bbb6eb9..986470e0f0b 100644
--- a/addons/base/static/src/js/list.js
+++ b/addons/base/static/src/js/list.js
@@ -1,6 +1,7 @@
 
 openerp.base.list = function (openerp) {
 
+openerp.base.views.add('tree', 'openerp.base.ListView');
 openerp.base.ListView = openerp.base.Controller.extend({
     init: function(session, element_id, dataset, view_id) {
         this._super(session, element_id);
diff --git a/addons/base/static/src/js/views.js b/addons/base/static/src/js/views.js
index 438f9fac3e4..55e99d9fef9 100644
--- a/addons/base/static/src/js/views.js
+++ b/addons/base/static/src/js/views.js
@@ -19,7 +19,6 @@ openerp.base.ActionManager = openerp.base.Controller.extend({
         // instantiate the right controllers by understanding the action
         this.action = action;
         // TODO: handle target=new
-        console.log(action);
         if(action.type == "ir.actions.act_window") {
             if (this.viewmanager) {
                 this.viewmanager.stop();
@@ -31,23 +30,27 @@ openerp.base.ActionManager = openerp.base.Controller.extend({
     }
 });
 
+/**
+ * Registry for all the main views
+ */
+openerp.base.views = new openerp.base.Registry();
 openerp.base.ViewManager =  openerp.base.Controller.extend({
-// This will be ViewManager Abstract/Common
+    // This will be ViewManager Abstract/Common
     init: function(session, element_id) {
         this._super(session, element_id);
         this.action = null;
         this.dataset = null;
-        this.searchview_id = false;
         this.searchview = null;
-        this.search_visible = true;
         // this.views = { "list": { "view_id":1234, "controller": instance} }
         this.views = {};
     },
     start: function() {
     },
     on_mode_switch: function(view_type) {
-        for (var i in this.views) {
-           this.views[i].controller.$element.toggle(i === view_type);
+        for (var type in this.views) {
+           this.views[type].controller.$element.toggle(type === view_type);
+            this.$element.find('#' + this.element_id + '_button_' + type)
+                .attr('disabled', type === view_type);
         }
     },
     /**
@@ -67,6 +70,28 @@ openerp.base.ViewManager =  openerp.base.Controller.extend({
         });
         return defaults;
     },
+    /**
+     * Sets up the current viewmanager's search view.
+     *
+     * @param action the action being executed
+     */
+    setup_search_view:function (action) {
+        if (this.searchview) {
+            this.searchview.stop();
+        }
+
+        var searchview = this.searchview = new openerp.base.SearchView(
+                this.session, this.element_id + "_search",
+                this.dataset, action.search_view_id[0] || false,
+                this.search_defaults());
+        searchview.on_search.add(this.do_search);
+        searchview.start();
+
+        if (action['auto_search']) {
+            searchview.on_loaded.add_last(
+                    searchview.do_search);
+        }
+    },
     do_action_window: function(action) {
         var self = this;
         var prefix_id = "#" + this.element_id;
@@ -76,42 +101,23 @@ openerp.base.ViewManager =  openerp.base.Controller.extend({
 
         this.$element.html(QWeb.render("ViewManager", {"prefix": this.element_id, views: action.views}));
 
-        this.searchview_id = false;
-        if(this.search_visible && action.search_view_id) {
-            this.searchview_id = action.search_view_id[0];
-            var searchview = this.searchview = new openerp.base.SearchView(
-                    this.session, this.element_id + "_search",
-                    this.dataset, this.searchview_id,
-                    this.search_defaults());
-            searchview.on_search.add(this.do_search);
-            searchview.start();
+        this.setup_search_view(action);
+
+        _.each(action.views, function (view_descriptor) {
+            var view_id = view_descriptor[0],
+                view_type = view_descriptor[1];
+            var view = new (openerp.base.views.get_object(view_type))(
+                    self.session, self.element_id + '_view_' + view_type,
+                    self.dataset, view_id);
+            view.start();
+            self.views[view_type] = { view_id: view_id, controller: view };
+            self.$element.find(prefix_id + '_button_' + view_type).click(function () {
+                self.on_mode_switch(view_type);
+            });
+        });
 
-            if (action['auto_search']) {
-                searchview.on_loaded.add_last(
-                    searchview.do_search);
-            }
-        }
-        for(var i = 0; i < action.views.length; i++)  {
-            var view_id, controller;
-            view_id = action.views[i][0];
-            if(action.views[i][1] == "tree") {
-                controller = new openerp.base.ListView(this.session, this.element_id + "_view_tree", this.dataset, view_id);
-                controller.start();
-                this.views.tree = { view_id: view_id, controller: controller };
-                this.$element.find(prefix_id + "_button_tree").bind('click',function(){
-                    self.on_mode_switch("tree");
-                });
-            } else if(action.views[i][1] == "form") {
-                controller = new openerp.base.FormView(this.session, this.element_id + "_view_form", this.dataset, view_id);
-                controller.start();
-                this.views.form = { view_id: view_id, controller: controller };
-                this.$element.find(prefix_id + "_button_form").bind('click',function(){
-                   self.on_mode_switch("form");
-                });
-            }
-        }
         // switch to the first one in sequence
-        this.on_mode_switch("tree");
+        this.on_mode_switch(action.view_mode.split(',')[0]);
     },
     // create when root, also add to parent when o2m
     on_create: function() {
@@ -234,10 +240,12 @@ openerp.base.BaseWidget = openerp.base.Controller.extend({
     }
 });
 
+openerp.base.views.add('calendar', 'openerp.base.CalendarView');
 openerp.base.CalendarView = openerp.base.Controller.extend({
 // Dhtmlx scheduler ?
 });
 
+openerp.base.views.add('gantt', 'openerp.base.GanttView');
 openerp.base.GanttView = openerp.base.Controller.extend({
 // Dhtmlx gantt ?
 });
@@ -246,6 +254,7 @@ openerp.base.DiagramView = openerp.base.Controller.extend({
 // 
 });
 
+openerp.base.views.add('graph', 'openerp.base.GraphView');
 openerp.base.GraphView = openerp.base.Controller.extend({
 });
 
diff --git a/addons/base/static/src/xml/base.xml b/addons/base/static/src/xml/base.xml
index 006f8106105..5b72291bb0e 100644
--- a/addons/base/static/src/xml/base.xml
+++ b/addons/base/static/src/xml/base.xml
@@ -134,9 +134,9 @@
             <input t-attf-id="#{prefix}_button_#{view[1]}" type="button" t-att-value="view[1]"/>
         </t>
     </div>
-    <div t-attf-id="#{prefix}_search"></div>
+    <div t-attf-id="#{prefix}_search"/>
     <t t-foreach="views" t-as="view">
-        <div t-attf-id="#{prefix}_view_#{view[1]}"></div>
+        <div t-attf-id="#{prefix}_view_#{view[1]}"/>
     </t>
 </t>
 <t t-name="ListView">

From baf8d2d9a9b46c2216bf90bec48d68efb19d9acb Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Thu, 31 Mar 2011 17:25:31 +0200
Subject: [PATCH 3/9] [IMP] server behavior fix: split tree view mode into tree
 and list based on view_type, nuke view_type

bzr revid: xmo@openerp.com-20110331152531-cpff6js0k8v4dtk9
---
 addons/base/controllers/main.py    | 30 +++++++++++++++++
 addons/base/static/src/js/list.js  |  2 +-
 addons/base/static/src/js/views.js |  8 +++++
 addons/base/test/test_menu.py      | 52 ++++++++++++++++++++++++++++++
 4 files changed, 91 insertions(+), 1 deletion(-)

diff --git a/addons/base/controllers/main.py b/addons/base/controllers/main.py
index 40d1c7f5823..6e99aed0c36 100644
--- a/addons/base/controllers/main.py
+++ b/addons/base/controllers/main.py
@@ -230,8 +230,38 @@ class Menu(openerpweb.Controller):
                     req.session.evaluation_context(
                         action['context'])) or []
 
+            self.fix_view_modes(action)
+
         return {"action": actions}
 
+    def fix_view_modes(self, action):
+        """ For historical reasons, OpenERP has weird dealings in relation to
+        view_mode and the view_type attribute (on window actions):
+
+        * one of the view modes is ``tree``, which stands for both list views
+          and tree views
+        * the choice is made by checking ``view_type``, which is either
+          ``form`` for a list view or ``tree`` for an actual tree view
+
+        This methods simply folds the view_type into view_mode by adding a
+        new view mode ``list`` which is the result of the ``tree`` view_mode
+        in conjunction with the ``form`` view_type.
+
+        TODO: this should go into the doc, some kind of "peculiarities" section
+
+        :param dict action: an action descriptor
+        :returns: nothing, the action is modified in place
+        """
+        if action.pop('view_type') != 'form':
+            return
+
+        action['view_mode'] = ','.join(
+            mode if mode != 'tree' else 'list'
+            for mode in action['view_mode'].split(','))
+        action['views'] = [
+            [id, mode if mode != 'tree' else 'list']
+            for id, mode in action['views']
+        ]
 
 class DataSet(openerpweb.Controller):
     _cp_path = "/base/dataset"
diff --git a/addons/base/static/src/js/list.js b/addons/base/static/src/js/list.js
index 986470e0f0b..2f82f9b50ed 100644
--- a/addons/base/static/src/js/list.js
+++ b/addons/base/static/src/js/list.js
@@ -1,7 +1,7 @@
 
 openerp.base.list = function (openerp) {
 
-openerp.base.views.add('tree', 'openerp.base.ListView');
+openerp.base.views.add('list', 'openerp.base.ListView');
 openerp.base.ListView = openerp.base.Controller.extend({
     init: function(session, element_id, dataset, view_id) {
         this._super(session, element_id);
diff --git a/addons/base/static/src/js/views.js b/addons/base/static/src/js/views.js
index 55e99d9fef9..a66bf3ab4e9 100644
--- a/addons/base/static/src/js/views.js
+++ b/addons/base/static/src/js/views.js
@@ -250,6 +250,14 @@ openerp.base.GanttView = openerp.base.Controller.extend({
 // Dhtmlx gantt ?
 });
 
+openerp.base.views.add('tree', 'openerp.base.TreeView');
+/**
+ * Genuine tree view (the one displayed as a tree, not the list)
+ */
+openerp.base.TreeView = openerp.base.Controller.extend({
+
+});
+
 openerp.base.DiagramView = openerp.base.Controller.extend({
 // 
 });
diff --git a/addons/base/test/test_menu.py b/addons/base/test/test_menu.py
index c63b19591aa..8f2c5bc42fc 100644
--- a/addons/base/test/test_menu.py
+++ b/addons/base/test/test_menu.py
@@ -97,3 +97,55 @@ class LoadTest(unittest2.TestCase):
                  }]
             }]
         )
+
+class ActionMungerTest(unittest2.TestCase):
+    def setUp(self):
+        self.menu = base.controllers.main.Menu()
+    def test_actual_treeview(self):
+        action = {
+            "views": [[False, "tree"], [False, "form"],
+                      [False, "calendar"]],
+            "view_type": "tree",
+            "view_id": False,
+            "view_mode": "tree,form,calendar"
+        }
+        changed = action.copy()
+        del action['view_type']
+        self.menu.fix_view_modes(changed)
+
+        self.assertEqual(changed, action)
+
+    def test_list_view(self):
+        action = {
+            "views": [[False, "tree"], [False, "form"],
+                      [False, "calendar"]],
+            "view_type": "form",
+            "view_id": False,
+            "view_mode": "tree,form,calendar"
+        }
+        self.menu.fix_view_modes(action)
+
+        self.assertEqual(action, {
+            "views": [[False, "list"], [False, "form"],
+                      [False, "calendar"]],
+            "view_id": False,
+            "view_mode": "list,form,calendar"
+        })
+
+    def test_redundant_views(self):
+
+        action = {
+            "views": [[False, "tree"], [False, "form"],
+                      [False, "calendar"], [42, "tree"]],
+            "view_type": "form",
+            "view_id": False,
+            "view_mode": "tree,form,calendar"
+        }
+        self.menu.fix_view_modes(action)
+
+        self.assertEqual(action, {
+            "views": [[False, "list"], [False, "form"],
+                      [False, "calendar"], [42, "list"]],
+            "view_id": False,
+            "view_mode": "list,form,calendar"
+        })

From de1912d2a138d54a085d52007883aa30e5d0e697 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Fri, 1 Apr 2011 11:06:53 +0200
Subject: [PATCH 4/9] [IMP] enabling/disabling of switcher buttons on view
 switch

bzr revid: xmo@openerp.com-20110401090653-jr21w79p5e5pdfts
---
 addons/base/static/src/css/base.css | 2 +-
 addons/base/static/src/js/views.js  | 8 +++++++-
 addons/base/static/src/xml/base.xml | 2 +-
 3 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/addons/base/static/src/css/base.css b/addons/base/static/src/css/base.css
index 4fc11cd1172..a92f80f8f56 100644
--- a/addons/base/static/src/css/base.css
+++ b/addons/base/static/src/css/base.css
@@ -396,7 +396,7 @@ body.openerp {
 }
 
 /* View Manager */
-.openerp .views_switchers {
+.openerp .views-switchers {
     text-align: right;
 }
 
diff --git a/addons/base/static/src/js/views.js b/addons/base/static/src/js/views.js
index 45a823f0181..8fa11b96049 100644
--- a/addons/base/static/src/js/views.js
+++ b/addons/base/static/src/js/views.js
@@ -55,6 +55,12 @@ openerp.base.ViewManager =  openerp.base.Controller.extend({
             controller.start();
             this.views[view_type].controller = controller;
         }
+
+        this.$element
+            .find('.views-switchers button').attr('disabled', true)
+            .filter('[data-view-type!="' + view_type + '"]')
+                .removeAttr('disabled');
+
         for (var i in this.views) {
             if (this.views[i].controller) {
                this.views[i].controller.$element.toggle(i === view_type);
@@ -108,7 +114,7 @@ openerp.base.ViewManager =  openerp.base.Controller.extend({
 
         this.setup_search_view(action);
 
-        this.$element.find('.views_switchers button').click(function() {
+        this.$element.find('.views-switchers button').click(function() {
             self.on_mode_switch($(this).data('view-type'));
         });
         _.each(action.views, function(view) {
diff --git a/addons/base/static/src/xml/base.xml b/addons/base/static/src/xml/base.xml
index 6dac4cb1b94..d610ea001b4 100644
--- a/addons/base/static/src/xml/base.xml
+++ b/addons/base/static/src/xml/base.xml
@@ -126,7 +126,7 @@
 </t>
 <t t-name="ViewManager">
     <!-- TODO prefix id with the element_id of the controller t-attf-id="#{prefix}_localid" -->
-    <div class="views_switchers">
+    <div class="views-switchers">
         <t t-foreach="views" t-as="view">
             <button type="button" t-att-data-view-type="view[1]">
                 <t t-esc="view[1]"/>

From 52fb7adc6662d995a9e09f5aaec2e62471e99fbc Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Fri, 1 Apr 2011 11:11:17 +0200
Subject: [PATCH 5/9] [IMP] reverse logic for handling view-switching buttons
 so it's more efficient and straightforward

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

diff --git a/addons/base/static/src/js/views.js b/addons/base/static/src/js/views.js
index 8fa11b96049..c09f00f25c9 100644
--- a/addons/base/static/src/js/views.js
+++ b/addons/base/static/src/js/views.js
@@ -57,9 +57,9 @@ openerp.base.ViewManager =  openerp.base.Controller.extend({
         }
 
         this.$element
-            .find('.views-switchers button').attr('disabled', true)
-            .filter('[data-view-type!="' + view_type + '"]')
-                .removeAttr('disabled');
+            .find('.views-switchers button').removeAttr('disabled')
+            .filter('[data-view-type="' + view_type + '"]')
+                .attr('disabled', true);
 
         for (var i in this.views) {
             if (this.views[i].controller) {

From a806fe63cc6de201abca30dd592b1fb30d40d85a Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Fri, 1 Apr 2011 11:40:30 +0200
Subject: [PATCH 6/9] [ADD] fake views init in order to check the views are
 correctly instantiated

bzr revid: xmo@openerp.com-20110401094030-jysoq5gj9k20ulrd
---
 addons/base/static/src/js/views.js | 20 ++++++++++++++++----
 1 file changed, 16 insertions(+), 4 deletions(-)

diff --git a/addons/base/static/src/js/views.js b/addons/base/static/src/js/views.js
index c09f00f25c9..9b0572b434d 100644
--- a/addons/base/static/src/js/views.js
+++ b/addons/base/static/src/js/views.js
@@ -236,12 +236,18 @@ openerp.base.BaseWidget = openerp.base.Controller.extend({
 
 openerp.base.views.add('calendar', 'openerp.base.CalendarView');
 openerp.base.CalendarView = openerp.base.Controller.extend({
-// Dhtmlx scheduler ?
+    start: function () {
+        this._super();
+        this.$element.append('Calendar view');
+    }
 });
 
 openerp.base.views.add('gantt', 'openerp.base.GanttView');
 openerp.base.GanttView = openerp.base.Controller.extend({
-// Dhtmlx gantt ?
+    start: function () {
+        this._super();
+        this.$element.append('Gantt view');
+    }
 });
 
 openerp.base.views.add('tree', 'openerp.base.TreeView');
@@ -249,15 +255,21 @@ openerp.base.views.add('tree', 'openerp.base.TreeView');
  * Genuine tree view (the one displayed as a tree, not the list)
  */
 openerp.base.TreeView = openerp.base.Controller.extend({
-
+    start: function () {
+        this._super();
+        this.$element.append('Tree view');
+    }
 });
 
 openerp.base.DiagramView = openerp.base.Controller.extend({
-// 
 });
 
 openerp.base.views.add('graph', 'openerp.base.GraphView');
 openerp.base.GraphView = openerp.base.Controller.extend({
+    start: function () {
+        this._super();
+        this.$element.append('Graph view');
+    }
 });
 
 openerp.base.ProcessView = openerp.base.Controller.extend({

From f40d778c2edb0c572b06c57060d8f37cf91b9d86 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Fri, 1 Apr 2011 11:48:35 +0200
Subject: [PATCH 7/9] [FIX] some domains and contexts have leading or trailing
 slashes, need to strip them before evaluation

bzr revid: xmo@openerp.com-20110401094835-k1w7xlgdcyppt7io
---
 addons/base/controllers/main.py | 4 ++--
 addons/base/test/test_view.py   | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/addons/base/controllers/main.py b/addons/base/controllers/main.py
index 6e99aed0c36..0258b86e616 100644
--- a/addons/base/controllers/main.py
+++ b/addons/base/controllers/main.py
@@ -408,7 +408,7 @@ class View(openerpweb.Controller):
         :param session: Current OpenERP session
         :type session: openerpweb.openerpweb.OpenERPSession
         """
-        domain = elem.get(attr_name)
+        domain = elem.get(attr_name, '').strip()
         if domain:
             try:
                 elem.set(
@@ -433,7 +433,7 @@ class View(openerpweb.Controller):
         """
         self.parse_domain(elem, 'domain', session)
         self.parse_domain(elem, 'filter_domain', session)
-        context_string = elem.get('context')
+        context_string = elem.get('context', '').strip()
         if context_string:
             try:
                 elem.set('context',
diff --git a/addons/base/test/test_view.py b/addons/base/test/test_view.py
index fa1779665f8..e5c6162dae0 100644
--- a/addons/base/test/test_view.py
+++ b/addons/base/test/test_view.py
@@ -32,7 +32,7 @@ class ViewTest(unittest2.TestCase):
 
     def test_convert_literal_domain(self):
         e = xml.etree.ElementTree.Element(
-            'field', domain="[('somefield', '=', 3)]")
+            'field', domain="  [('somefield', '=', 3)]  ")
         self.view.parse_domains_and_contexts(e, None)
 
         self.assertEqual(
@@ -75,7 +75,7 @@ class ViewTest(unittest2.TestCase):
 
     def test_convert_literal_context(self):
         e = xml.etree.ElementTree.Element(
-            'field', context="{'some_prop':  3}")
+            'field', context="  {'some_prop':  3}  ")
         self.view.parse_domains_and_contexts(e, None)
 
         self.assertEqual(

From 0a5a8cd81a5c53966328af3f9c314c994c394590 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Fri, 1 Apr 2011 12:45:00 +0200
Subject: [PATCH 8/9] [IMP] show and hide search view based on whether the
 currently displayed view is searchable

Note: searchability is *opt-out*, a view is searchable until it unambiguously states 'do not search me'

bzr revid: xmo@openerp.com-20110401104500-n7g6so01xb8oow3n
---
 addons/base/controllers/main.py     |  1 +
 addons/base/static/src/js/form.js   | 15 ++++++++++++++-
 addons/base/static/src/js/search.js |  6 ++++++
 addons/base/static/src/js/views.js  |  6 ++++++
 4 files changed, 27 insertions(+), 1 deletion(-)

diff --git a/addons/base/controllers/main.py b/addons/base/controllers/main.py
index 0258b86e616..73d44041248 100644
--- a/addons/base/controllers/main.py
+++ b/addons/base/controllers/main.py
@@ -88,6 +88,7 @@ class Session(openerpweb.Controller):
     @openerpweb.jsonrequest
     def login(self, req, db, login, password):
         req.session.login(db, login, password)
+
         return {
             "session_id": req.session_id,
             "uid": req.session._uid,
diff --git a/addons/base/static/src/js/form.js b/addons/base/static/src/js/form.js
index 85cbce98bd8..707a5149542 100644
--- a/addons/base/static/src/js/form.js
+++ b/addons/base/static/src/js/form.js
@@ -2,7 +2,20 @@
 openerp.base.form = function (openerp) {
 
 openerp.base.views.add('form', 'openerp.base.FormView');
-openerp.base.FormView =  openerp.base.Controller.extend({
+openerp.base.FormView =  openerp.base.Controller.extend(
+    /** @lends openerp.base.FormView# */{
+    /**
+     * Indicates that this view is not searchable, and thus that no search
+     * view should be displayed (if there is one active).
+     */
+    searchable: false,
+    /**
+     * @constructs
+     * @param {openerp.base.Session} session the current openerp session
+     * @param {String} element_id this view's root element id
+     * @param {openerp.base.DataSet} dataset the dataset this view will work with
+     * @param {String} view_id the identifier of the OpenERP view object
+     */
     init: function(session, element_id, dataset, view_id) {
         this._super(session, element_id);
         this.dataset = dataset;
diff --git a/addons/base/static/src/js/search.js b/addons/base/static/src/js/search.js
index 5d6b175ac88..ef00a051626 100644
--- a/addons/base/static/src/js/search.js
+++ b/addons/base/static/src/js/search.js
@@ -16,6 +16,12 @@ openerp.base.SearchView = openerp.base.Controller.extend({
         //this.log('Starting SearchView '+this.model+this.view_id)
         this.rpc("/base/searchview/load", {"model": this.model, "view_id":this.view_id}, this.on_loaded);
     },
+    show: function () {
+        this.$element.show();
+    },
+    hide: function () {
+        this.$element.hide();
+    },
     /**
      * Builds a list of widget rows (each row is an array of widgets)
      *
diff --git a/addons/base/static/src/js/views.js b/addons/base/static/src/js/views.js
index 9b0572b434d..4e26766bafc 100644
--- a/addons/base/static/src/js/views.js
+++ b/addons/base/static/src/js/views.js
@@ -56,6 +56,12 @@ openerp.base.ViewManager =  openerp.base.Controller.extend({
             this.views[view_type].controller = controller;
         }
 
+        if (view.controller.searchable === false) {
+            this.searchview.hide();
+        } else {
+            this.searchview.show();
+        }
+
         this.$element
             .find('.views-switchers button').removeAttr('disabled')
             .filter('[data-view-type="' + view_type + '"]')

From f880ecb5d98f31d3ad3051df96f55b76bc0820a2 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Fri, 1 Apr 2011 13:50:05 +0200
Subject: [PATCH 9/9] [FIX] race condition on auto_search due to desynchronized
 loading of search view and {any default main view}

If loading of search view completes before loading of content view, do_search is immediately called on search view and forwarded to content view which is *not* ready yet and therefore blows up.

Solved by having start() methods return a promise object (or a non-promise object taken as a fulfilled promise) which the viewmanager can use (from both search view and initial content view) to synchronize when both are ready and it's possible to start a search

bzr revid: xmo@openerp.com-20110401115005-inceqsj7qn4k3b8e
---
 addons/base/static/src/js/chrome.js | 44 +++++++++++++++++++++++++++--
 addons/base/static/src/js/form.js   |  2 +-
 addons/base/static/src/js/list.js   |  2 +-
 addons/base/static/src/js/search.js |  2 +-
 addons/base/static/src/js/views.js  | 25 +++++++++++-----
 5 files changed, 62 insertions(+), 13 deletions(-)

diff --git a/addons/base/static/src/js/chrome.js b/addons/base/static/src/js/chrome.js
index 14577c9d0ab..523f2c8a2b7 100644
--- a/addons/base/static/src/js/chrome.js
+++ b/addons/base/static/src/js/chrome.js
@@ -184,8 +184,19 @@ openerp.base.BasicController = Class.extend(
      * Controller start
      * event binding, rpc and callback calling required to initialize the
      * object can happen here
+     *
+     * Returns a promise object letting callers (subclasses and direct callers)
+     * know when this component is done starting
+     *
+     * @returns {jQuery.Deferred}
      */
     start: function() {
+        // returns an already fulfilled promise. Maybe we could return nothing?
+        // $.when can take non-deferred and in that case it simply considers
+        // them all as fulfilled promises.
+        // But in thise case we *have* to ensure callers use $.when and don't
+        // try to call deferred methods on this return value.
+        return $.Deferred().done().promise();
     },
     stop: function() {
     },
@@ -250,6 +261,19 @@ openerp.base.Session = openerp.base.BasicController.extend(
             }
         });
     },
+    /**
+     * Executes an RPC call, registering the provided callbacks.
+     *
+     * Registers a default error callback if none is provided, and handles
+     * setting the correct session id and session context in the parameter
+     * objects
+     *
+     * @param {String} url RPC endpoint
+     * @param {Object} params call parameters
+     * @param {Function} success_callback function to execute on RPC call success
+     * @param {Function} error_callback function to execute on RPC call failure
+     * @returns {jQuery.Deferred} jquery-provided ajax deferred
+     */
     rpc: function(url, params, success_callback, error_callback) {
         // Construct a JSON-RPC2 request, method is currently unused
         params.session_id = this.session_id;
@@ -259,17 +283,22 @@ openerp.base.Session = openerp.base.BasicController.extend(
         error_callback = typeof(error_callback) != "undefined" ? error_callback : this.on_rpc_error;
 
         // Call using the rpc_mode
-        this.rpc_ajax(url, {
+        return this.rpc_ajax(url, {
             jsonrpc: "2.0",
             method: "call",
             params: params,
             id:null
         }, success_callback, error_callback);
     },
+    /**
+     * Raw JSON-RPC call
+     *
+     * @returns {jQuery.Deferred} ajax-based deferred object
+     */
     rpc_ajax: function(url, payload, success_callback, error_callback) {
         var self = this;
         this.on_rpc_request();
-        $.ajax({
+        return $.ajax({
             type: "POST",
             url: url,
             dataType: 'json',
@@ -446,9 +475,18 @@ openerp.base.Controller = openerp.base.BasicController.extend(
         if(this.session)
             this.session.log.apply(this.session,arguments);
     },
+    /**
+     * Performs a JSON-RPC call
+     *
+     * @param {String} url endpoint url
+     * @param {Object} data RPC parameters
+     * @param {Function} success RPC call success callback
+     * @param {Function} error RPC call error callback
+     * @returns {jQuery.Deferred} deferred object for the RPC call
+     */
     rpc: function(url, data, success, error) {
         // TODO: support additional arguments ?
-        this.session.rpc(url, data, success, error);
+        return this.session.rpc(url, data, success, error);
     }
 });
 
diff --git a/addons/base/static/src/js/form.js b/addons/base/static/src/js/form.js
index 707a5149542..65ebd80d751 100644
--- a/addons/base/static/src/js/form.js
+++ b/addons/base/static/src/js/form.js
@@ -30,7 +30,7 @@ openerp.base.FormView =  openerp.base.Controller.extend(
     },
     start: function() {
         //this.log('Starting FormView '+this.model+this.view_id)
-        this.rpc("/base/formview/load", {"model": this.model, "view_id": this.view_id}, this.on_loaded);
+        return this.rpc("/base/formview/load", {"model": this.model, "view_id": this.view_id}, this.on_loaded);
     },
     on_loaded: function(data) {
         var self = this;
diff --git a/addons/base/static/src/js/list.js b/addons/base/static/src/js/list.js
index 5c8599176a1..c64f08a79cf 100644
--- a/addons/base/static/src/js/list.js
+++ b/addons/base/static/src/js/list.js
@@ -23,7 +23,7 @@ openerp.base.ListView = openerp.base.Controller.extend({
     },
     start: function() {
         //this.log('Starting ListView '+this.model+this.view_id)
-        this.rpc("/base/listview/load", {"model": this.model, "view_id":this.view_id}, this.on_loaded);
+        return this.rpc("/base/listview/load", {"model": this.model, "view_id":this.view_id}, this.on_loaded);
     },
     on_loaded: function(data) {
         this.fields_view = data.fields_view;
diff --git a/addons/base/static/src/js/search.js b/addons/base/static/src/js/search.js
index ef00a051626..b66d1d759aa 100644
--- a/addons/base/static/src/js/search.js
+++ b/addons/base/static/src/js/search.js
@@ -14,7 +14,7 @@ openerp.base.SearchView = openerp.base.Controller.extend({
     },
     start: function() {
         //this.log('Starting SearchView '+this.model+this.view_id)
-        this.rpc("/base/searchview/load", {"model": this.model, "view_id":this.view_id}, this.on_loaded);
+        return this.rpc("/base/searchview/load", {"model": this.model, "view_id":this.view_id}, this.on_loaded);
     },
     show: function () {
         this.$element.show();
diff --git a/addons/base/static/src/js/views.js b/addons/base/static/src/js/views.js
index 4e26766bafc..c914edfea85 100644
--- a/addons/base/static/src/js/views.js
+++ b/addons/base/static/src/js/views.js
@@ -44,7 +44,14 @@ openerp.base.ViewManager =  openerp.base.Controller.extend({
     },
     start: function() {
     },
+    /**
+     * Asks the view manager to switch visualization mode.
+     *
+     * @param {String} view_type type of view to display
+     * @returns {jQuery.Deferred} new view loading promise
+     */
     on_mode_switch: function(view_type) {
+        var view_promise;
         this.active_view = view_type;
         var view = this.views[view_type];
         if (!view.controller) {
@@ -52,7 +59,7 @@ openerp.base.ViewManager =  openerp.base.Controller.extend({
             var controller = new (openerp.base.views.get_object(view_type))(
                 this.session, this.element_id + "_view_" + view_type,
                 this.dataset, view.view_id);
-            controller.start();
+            view_promise = controller.start();
             this.views[view_type].controller = controller;
         }
 
@@ -72,6 +79,7 @@ openerp.base.ViewManager =  openerp.base.Controller.extend({
                this.views[i].controller.$element.toggle(i === view_type);
             }
         }
+        return view_promise;
     },
     /**
      * Extract search view defaults from the current action's context.
@@ -94,6 +102,7 @@ openerp.base.ViewManager =  openerp.base.Controller.extend({
      * Sets up the current viewmanager's search view.
      *
      * @param action the action being executed
+     * @returns {jQuery.Deferred} search view startup deferred
      */
     setup_search_view:function (action) {
         var self = this;
@@ -108,7 +117,7 @@ openerp.base.ViewManager =  openerp.base.Controller.extend({
         searchview.on_search.add(function() {
             self.views[self.active_view].controller.do_search.apply(self, arguments);
         });
-        searchview.start();
+        return searchview.start();
     },
     do_action_window: function(action) {
         var self = this;
@@ -118,7 +127,7 @@ openerp.base.ViewManager =  openerp.base.Controller.extend({
 
         this.$element.html(QWeb.render("ViewManager", {"prefix": this.element_id, views: action.views}));
 
-        this.setup_search_view(action);
+        var searchview_loaded = this.setup_search_view(action);
 
         this.$element.find('.views-switchers button').click(function() {
             self.on_mode_switch($(this).data('view-type'));
@@ -127,11 +136,13 @@ openerp.base.ViewManager =  openerp.base.Controller.extend({
             self.views[view[1]] = { view_id: view[0], controller: null };
         });
 
-        if (action['auto_search']) {
-            this.searchview.on_loaded.add_last(this.searchview.do_search);
-        }
         // switch to the first one in sequence
-        this.on_mode_switch(action.views[0][1]);
+        var inital_view_loaded = this.on_mode_switch(action.views[0][1]);
+
+        if (action['auto_search']) {
+            $.when(searchview_loaded, inital_view_loaded)
+                .then(this.searchview.do_search);
+        }
     },
     // create when root, also add to parent when o2m
     on_create: function() {