From 4d76991c55bc25091cf2941160736e2c9e9139a5 Mon Sep 17 00:00:00 2001
From: Fabien Meghazi <fme@openerp.com>
Date: Thu, 31 Mar 2011 16:44:22 +0200
Subject: [PATCH] [FIX] Search is now done by the view and not by the
 viewmanager

bzr revid: fme@openerp.com-20110331144422-34wmf2bauc0lmz7d
---
 addons/base/static/src/js/form.js  |  2 ++
 addons/base/static/src/js/list.js  | 17 +++++++++++++++++
 addons/base/static/src/js/views.js | 30 ++++++++++--------------------
 3 files changed, 29 insertions(+), 20 deletions(-)

diff --git a/addons/base/static/src/js/form.js b/addons/base/static/src/js/form.js
index 9c0f8e9bf6b..be82b19c857 100644
--- a/addons/base/static/src/js/form.js
+++ b/addons/base/static/src/js/form.js
@@ -91,6 +91,8 @@ openerp.base.FormView =  openerp.base.Controller.extend({
     },
     on_saved: function() {
         // Check response for exceptions, display error
+    },
+    do_search: function (domains, contexts, groupbys) {
     }
 });
 
diff --git a/addons/base/static/src/js/list.js b/addons/base/static/src/js/list.js
index f572bbb6eb9..4d4f6b4878c 100644
--- a/addons/base/static/src/js/list.js
+++ b/addons/base/static/src/js/list.js
@@ -8,6 +8,9 @@ openerp.base.ListView = openerp.base.Controller.extend({
         this.model = dataset.model;
         this.view_id = view_id;
         this.name = "";
+        // TODO: default to action.limit
+        // TODO: decide if limit is a property of DataSet and thus global to all views (calendar ?)
+        this.limit = 80;
 
         this.cols = [];
 
@@ -72,6 +75,20 @@ openerp.base.ListView = openerp.base.Controller.extend({
                 return record.values;
             }));
 
+    },
+    do_search: function (domains, contexts, groupbys) {
+        var self = this;
+        this.rpc('/base/session/eval_domain_and_context', {
+            domains: domains,
+            contexts: contexts,
+            group_by_seq: groupbys
+        }, function (results) {
+            // TODO: handle non-empty results.group_by with read_group
+            self.dataset.set({
+                context: results.context,
+                domain: results.domain
+            }).fetch(0, self.limit);
+        });
     }
 });
 
diff --git a/addons/base/static/src/js/views.js b/addons/base/static/src/js/views.js
index 164e5d6cf72..5acdd44ae65 100644
--- a/addons/base/static/src/js/views.js
+++ b/addons/base/static/src/js/views.js
@@ -34,6 +34,7 @@ openerp.base.ViewManager =  openerp.base.Controller.extend({
         this.searchview = null;
         this.search_visible = true;
         this.active_view = null;
+        this.auto_search = false;
         // this.views = { "list": { "view_id":1234, "controller": instance} }
         this.views = {};
     },
@@ -61,6 +62,10 @@ openerp.base.ViewManager =  openerp.base.Controller.extend({
             }
             controller.start();
             this.views[view_type].controller = controller;
+            if (this.auto_search) {
+                this.searchview.on_loaded.add_last(this.searchview.do_search);
+                this.auto_search = false;
+            }
         }
         for (var i in this.views) {
             if (this.views[i].controller) {
@@ -95,19 +100,18 @@ 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) {
+        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.on_search.add(function() {
+                self.views[self.active_view].controller.do_search.apply(self, arguments);
+            });
             searchview.start();
 
-            if (action['auto_search']) {
-                searchview.on_loaded.add_last(
-                    searchview.do_search);
-            }
+            this.auto_search = action.auto_search;
         }
         this.$element.find('.views_switchers button').click(function() {
             self.on_mode_switch($(this).data('view-type'));
@@ -124,20 +128,6 @@ openerp.base.ViewManager =  openerp.base.Controller.extend({
     on_remove: function() {
     },
     on_edit: function() {
-    },
-    do_search: function (domains, contexts, groupbys) {
-        var self = this;
-        this.rpc('/base/session/eval_domain_and_context', {
-            domains: domains,
-            contexts: contexts,
-            group_by_seq: groupbys
-        }, function (results) {
-            // TODO: handle non-empty results.group_by with read_group
-            self.dataset.set({
-                context: results.context,
-                domain: results.domain
-            }).fetch(0, self.action.limit);
-        });
     }
 });