summaryrefslogtreecommitdiff
path: root/addons/web/static/src/js/openerpframework.js
diff options
context:
space:
mode:
authorniv-openerp <nicolas.vanhoren@openerp.com>2013-08-05 15:40:59 +0200
committerniv-openerp <nicolas.vanhoren@openerp.com>2013-08-05 15:40:59 +0200
commit76ef945c96c8cb3bbd823965a00232b451ed8a1a (patch)
tree2dad6bbd8e69b9f626327f0c62ce28380e802354 /addons/web/static/src/js/openerpframework.js
parentd256d16e3ae3181720ce9f01dd1c58e5c0a3d063 (diff)
Corrected some stuff in openerp.web.Model
bzr revid: nicolas.vanhoren@openerp.com-20130805134059-3ayw6b0tqqberkaw
Diffstat (limited to 'addons/web/static/src/js/openerpframework.js')
-rw-r--r--addons/web/static/src/js/openerpframework.js10
1 files changed, 3 insertions, 7 deletions
diff --git a/addons/web/static/src/js/openerpframework.js b/addons/web/static/src/js/openerpframework.js
index 43a45e2d1d2..94149f94dbd 100644
--- a/addons/web/static/src/js/openerpframework.js
+++ b/addons/web/static/src/js/openerpframework.js
@@ -1055,7 +1055,7 @@ openerp.web.Session = openerp.web.Class.extend(openerp.web.PropertiesMixin, {
openerp.web.Model = openerp.web.Class.extend({
/**
- new openerp.web.Model([session,] model_name[, context[, domain]])
+ new openerp.web.Model([session,] model_name)
@constructs instance.web.Model
@extends instance.web.Class
@@ -1067,22 +1067,18 @@ openerp.web.Model = openerp.web.Class.extend({
@param {Array} [domain]
*/
init: function () {
- var session, model_name, context, domain;
+ var session, model_name;
var args = _.toArray(arguments);
args.reverse();
session = args.pop();
- if (! (session instanceof openerp.web.Session)) {
+ if (session && ! (session instanceof openerp.web.Session)) {
model_name = session;
session = null;
} else {
model_name = args.pop();
}
- context = args.length > 0 ? args.pop() : null;
- domain = args.length > 0 ? args.pop() : null;
this.name = model_name;
- this._context = context || {};
- this._domain = domain || [];
this._session = session;
},
session: function() {