From 3e1b00747837d8a05996a63abfd1e555ae6c686d Mon Sep 17 00:00:00 2001
From: Fabien Meghazi <fme@openerp.com>
Date: Mon, 3 Oct 2011 15:52:03 +0200
Subject: [PATCH] [IMP] Viewmanager sets dataset's domain & context on_search

bzr revid: fme@openerp.com-20111003135203-d3p18cfdh5jko976
---
 addons/web/static/src/js/views.js             |  7 ++++---
 addons/web_calendar/static/src/js/calendar.js |  6 ------
 addons/web_gantt/static/src/js/gantt.js       | 10 +---------
 addons/web_graph/static/src/js/graph.js       |  5 +----
 addons/web_kanban/static/src/js/kanban.js     |  5 +----
 5 files changed, 7 insertions(+), 26 deletions(-)

diff --git a/addons/web/static/src/js/views.js b/addons/web/static/src/js/views.js
index cfeb70a7e22..3eb4bdafb72 100644
--- a/addons/web/static/src/js/views.js
+++ b/addons/web/static/src/js/views.js
@@ -281,12 +281,13 @@ db.web.ViewManager =  db.web.Widget.extend(/** @lends db.web.ViewManager# */{
         var self = this,
             controller = this.views[this.active_view].controller;
         if (domains || contexts) {
-            //if ((!domains || !domains.length) && (!contexts || !contexts.length) && (!groupbys || !groupbys.length) { }
             this.rpc('/web/session/eval_domain_and_context', {
-                domains: [this.dataset.get_domain()].concat(domains || []),
-                contexts: [this.dataset.get_context()].concat(contexts || []),
+                domains: [this.action.domain || []].concat(domains || []),
+                contexts: [this.action.context || {}].concat(contexts || []),
                 group_by_seq: groupbys || []
             }, function (results) {
+                self.dataset.context = results.context;
+                self.dataset.domain = results.domain;
                 controller.do_search(results.domain, results.context, results.group_by);
                 self.last_search = [results.domain, results.context, results.group_by];
             });
diff --git a/addons/web_calendar/static/src/js/calendar.js b/addons/web_calendar/static/src/js/calendar.js
index f80e57ebf5d..f936547ed8c 100644
--- a/addons/web_calendar/static/src/js/calendar.js
+++ b/addons/web_calendar/static/src/js/calendar.js
@@ -15,8 +15,6 @@ openerp.web_calendar.CalendarView = openerp.web.View.extend({
         this.model = dataset.model;
         this.fields_view = {};
         this.view_id = view_id;
-        this.domain = this.dataset.domain || [];
-        this.context = this.dataset.context || {};
         this.has_been_loaded = $.Deferred();
         this.creating_event_id = null;
         this.dataset_events = [];
@@ -296,12 +294,8 @@ openerp.web_calendar.CalendarView = openerp.web.View.extend({
         scheduler.clearAll();
         $.when(this.has_been_loaded).then(function() {
             // TODO: handle non-empty results.group_by with read_group
-            self.context = context;
-            self.domain = domain;
             self.dataset.read_slice(_.keys(self.fields), {
                 offset: 0,
-                context: context,
-                domain: domain,
                 limit: self.limit
             }, function(events) {
                 self.dataset_events = events;
diff --git a/addons/web_gantt/static/src/js/gantt.js b/addons/web_gantt/static/src/js/gantt.js
index a045bae64e1..73e244edad7 100644
--- a/addons/web_gantt/static/src/js/gantt.js
+++ b/addons/web_gantt/static/src/js/gantt.js
@@ -509,15 +509,7 @@ init: function(parent, dataset, view_id) {
     do_search: function (domains, contexts, groupbys) {
         var self = this;
         this.grp = groupbys;
-        return this.rpc('/web/session/eval_domain_and_context', {
-            domains: domains,
-            contexts: contexts,
-            group_by_seq: groupbys
-        }, function (results) {
-            self.dataset.context = results.context;
-            self.dataset.domain = results.domain;
-            self.reload_gantt();
-        });
+        self.reload_gantt();
     }
 
 });
diff --git a/addons/web_graph/static/src/js/graph.js b/addons/web_graph/static/src/js/graph.js
index 5a72bf2a816..ffdec860906 100644
--- a/addons/web_graph/static/src/js/graph.js
+++ b/addons/web_graph/static/src/js/graph.js
@@ -369,10 +369,7 @@ openerp.web_graph.GraphView = openerp.web.View.extend({
         } else {
             this.abscissa = this.first_field;
         }
-        this.dataset.read_slice(this.list_fields(), {
-            context: context,
-            domain: domain
-        }, $.proxy(this, 'schedule_chart'));
+        this.dataset.read_slice(this.list_fields(), {}, $.proxy(this, 'schedule_chart'));
     }
 });
 };
diff --git a/addons/web_kanban/static/src/js/kanban.js b/addons/web_kanban/static/src/js/kanban.js
index 2e06482d375..23a0b75a322 100644
--- a/addons/web_kanban/static/src/js/kanban.js
+++ b/addons/web_kanban/static/src/js/kanban.js
@@ -446,10 +446,7 @@ openerp.web_kanban.KanbanView = openerp.web.View.extend({
             },
             function (dataset) {
                 self.groups = [];
-                self.dataset.read_slice([], {
-                    domain: domain,
-                    context: context
-                }, function(records) {
+                self.dataset.read_slice([], {}, function(records) {
                     if (records.length) {
                         self.all_display_data = [{'records': records, 'value':false, 'header' : false, 'ids': self.dataset.ids}];
                     } else {