[merge]

bzr revid: nicolas.vanhoren@openerp.com-20120405162718-rbdyzsh3ssawcoe3

1 files changed, 2 insertions, 21 deletions

diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js
index 1a09c3a7903..663ea0246e9 100644
--- a/addons/web/static/src/js/view_form.js
+++ b/addons/web/static/src/js/view_form.js
@@ -13,6 +13,7 @@ openerp.web.FormView = openerp.web.View.extend( /** @lends openerp.web.FormView#
     searchable: false,
     template: "FormView",
     display_name: _lt('Form'),
+    view_type: "form",
     /**
      * @constructs openerp.web.FormView
      * @extends openerp.web.View
@@ -52,27 +53,6 @@ openerp.web.FormView = openerp.web.View.extend( /** @lends openerp.web.FormView#
         this.set({"force_readonly": false});
         this.rendering_engine = new openerp.web.FormRenderingEngine(this);
     },
-    start: function() {
-        this._super();
-        return this.init_view();
-    },
-    init_view: function() {
-        if (this.embedded_view) {
-            var def = $.Deferred().then(this.on_loaded);
-            var self = this;
-            $.async_when().then(function() {def.resolve(self.embedded_view);});
-            return def.promise();
-        } else {
-            var context = new openerp.web.CompoundContext(this.dataset.get_context());
-            return this.rpc("/web/view/load", {
-                "model": this.model,
-                "view_id": this.view_id,
-                "view_type": "form",
-                toolbar: this.options.sidebar,
-                context: context
-                }, this.on_loaded);
-        }
-    },
     destroy: function() {
         if (this.sidebar) {
             this.sidebar.attachments.destroy();
@@ -123,6 +103,7 @@ openerp.web.FormView = openerp.web.View.extend( /** @lends openerp.web.FormView#
             }]);
         }
         this.has_been_loaded.resolve();
+        return $.when();
     },
 
     do_load_state: function(state, warm) {