[FIX] remove bloody crazy (and useless) indirection keys in DataSet.call and DataSet...

bzr revid: xmo@openerp.com-20110714100522-94rp1otj1n4hrf2x

diff --git a/addons/base/controllers/main.py b/addons/base/controllers/main.py
index 8138594..d6a8112 100644 (file)
--- a/addons/base/controllers/main.py
+++ b/addons/base/controllers/main.py
@@ -508,7 +508,7 @@ class DataSet(openerpweb.Controller):
 
     @openerpweb.jsonrequest
     def call(self, req, model, method, args, domain_id=None, context_id=None):
-        return {'result': self.call_common(req, model, method, args, domain_id, context_id)}
+        return self.call_common(req, model, method, args, domain_id, context_id)
 
     @openerpweb.jsonrequest
     def call_button(self, req, model, method, args, domain_id=None, context_id=None):
@@ -524,9 +524,8 @@ class DataSet(openerpweb.Controller):
 
     @openerpweb.jsonrequest
     def default_get(self, req, model, fields):
-        m = req.session.model(model)
-        r = m.default_get(fields, req.session.eval_context(req.context))
-        return {'result': r}
+        Model = req.session.model(model)
+        return Model.default_get(fields, req.session.eval_context(req.context))
 
 class DataGroup(openerpweb.Controller):
     _cp_path = "/base/group"

diff --git a/addons/base/static/src/js/form.js b/addons/base/static/src/js/form.js
index 60511c4..701b411 100644 (file)
--- a/addons/base/static/src/js/form.js
+++ b/addons/base/static/src/js/form.js
@@ -269,9 +269,8 @@ openerp.base.FormView =  openerp.base.View.extend( /** @lends openerp.base.FormV
     on_button_new: function() {
         var self = this;
         $.when(this.has_been_loaded).then(function() {
-            self.dataset.default_get(_.keys(self.fields_view.fields), function(result) {
-                self.on_record_loaded(result.result);
-            });
+            self.dataset.default_get(
+                _.keys(self.fields_view.fields), self.on_record_loaded);
         });
     },
     /**