[imp] modified gantt to be used in a o2m

bzr revid: nicolas.vanhoren@openerp.com-20120405162131-d611z2jvefpaabnd

diff --git a/addons/web/static/src/js/views.js b/addons/web/static/src/js/views.js
index 8264a3e..b43aa5c 100644 (file)
--- a/addons/web/static/src/js/views.js
+++ b/addons/web/static/src/js/views.js
@@ -1102,7 +1102,7 @@ session.web.View = session.web.Widget.extend(/** @lends session.web.View# */{
         } else {
             var context = new session.web.CompoundContext(this.dataset.get_context());
             if (! this.view_type)
-                console.warn("view_type is not defined");
+                console.warn("view_type is not defined", this);
             return this.rpc("/web/view/load", {
                 "model": this.dataset.model,
                 "view_id": this.view_id,

diff --git a/addons/web_dashboard/static/src/js/dashboard.js b/addons/web_dashboard/static/src/js/dashboard.js
index bae7427..5511094 100644 (file)
--- a/addons/web_dashboard/static/src/js/dashboard.js
+++ b/addons/web_dashboard/static/src/js/dashboard.js
@@ -294,7 +294,6 @@ openerp.web_dashboard.ConfigOverview = openerp.web.View.extend({
         this.dataset = new openerp.web.DataSetSearch(this, 'ir.actions.todo');
     },
     start: function () {
-        this._super();
         var self = this;
         return this.user.read_index(['groups_id']).pipe(function(record) {
             var todos_filter = [
@@ -383,7 +382,6 @@ openerp.web_dashboard.Widget = openerp.web.View.extend(/** @lends openerp.web_da
         this.widget_id = options.widget_id;
     },
     start: function () {
-        this._super();
         var ds = new openerp.web.DataSet(this, 'res.widget');
         return ds.read_ids([this.widget_id], ['title']).then(this.on_widget_loaded);
     },

diff --git a/addons/web_gantt/static/src/js/gantt.js b/addons/web_gantt/static/src/js/gantt.js
index 9f49ba7..132d95e 100644 (file)
--- a/addons/web_gantt/static/src/js/gantt.js
+++ b/addons/web_gantt/static/src/js/gantt.js
@@ -10,20 +10,19 @@ openerp.web.views.add('gantt', 'openerp.web_gantt.GanttView');
 openerp.web_gantt.GanttView = openerp.web.View.extend({
     display_name: _lt('Gantt'),
     template: "GanttView",
+    view_type: "gantt",
     init: function() {
         this._super.apply(this, arguments);
         this.has_been_loaded = $.Deferred();
         this.chart_id = _.uniqueId();
     },
-    start: function() {
-        return $.when(this.rpc("/web/view/load", {"model": this.dataset.model, "view_id": this.view_id, "view_type": "gantt"}),
-            this.rpc("/web/searchview/fields_get", {"model": this.dataset.model})).pipe(this.on_loaded);
-    },
-    on_loaded: function(fields_view, fields_get) {
-        this.fields_view = fields_view[0];
-        this.fields = fields_get[0].fields;
-        
-        this.has_been_loaded.resolve();
+    on_loaded: function(fields_view_get, fields_get) {
+        var self = this;
+        this.fields_view = fields_view_get;
+        return this.rpc("/web/searchview/fields_get", {"model": this.dataset.model}).pipe(function(fields_get) {
+            self.fields = fields_get.fields;
+            self.has_been_loaded.resolve();
+        });
     },
     do_search: function (domains, contexts, group_bys) {
         var self = this;