From 63e4d9b572f27a5cdfa347e159ebc7e39f240ce1 Mon Sep 17 00:00:00 2001 From: Christophe Simonis Date: Tue, 14 Aug 2012 17:29:00 +0200 Subject: [PATCH] [IMP] sed -i '' -e 's/connection/session/g' bzr revid: chs@openerp.com-20120814152900-8r84kyz0qy1hwkvz --- addons/web/static/src/js/chrome.js | 20 ++++++++-------- addons/web/static/src/js/corelib.js | 6 ++--- addons/web/static/src/js/coresetup.js | 10 ++++---- addons/web/static/src/js/data.js | 10 ++++---- addons/web/static/src/js/search.js | 2 +- addons/web/static/src/js/test_support.js | 12 +++++----- addons/web/static/src/js/view_form.js | 6 ++--- addons/web/static/src/js/view_list.js | 4 ++-- addons/web/static/test/evals.js | 8 +++---- addons/web/static/test/fulltest/dataset.js | 28 +++++++++++----------- addons/web/static/test/list-editable.js | 14 +++++------ addons/web/static/test/search.js | 20 ++++++++-------- addons/web/static/test/testing.js | 12 +++++----- addons/web_kanban/static/src/js/kanban.js | 6 ++--- 14 files changed, 79 insertions(+), 79 deletions(-) diff --git a/addons/web/static/src/js/chrome.js b/addons/web/static/src/js/chrome.js index 49621cc3410..c632ce5cd0b 100644 --- a/addons/web/static/src/js/chrome.js +++ b/addons/web/static/src/js/chrome.js @@ -193,7 +193,7 @@ instance.web.CrashManager = instance.web.CallbackEnabled.extend({ on_traceback: function(error) { var self = this; var buttons = {}; - if (instance.connection.openerp_entreprise) { + if (instance.session.openerp_entreprise) { buttons[_t("Send OpenERP Enterprise Report")] = function() { var $this = $(this); var issuename = $('#issuename').val(); @@ -224,7 +224,7 @@ instance.web.CrashManager = instance.web.CallbackEnabled.extend({ min_height: '600px', buttons: buttons }).open(); - dialog.$element.html(QWeb.render('CrashManager.error', {session: instance.connection, error: error})); + dialog.$element.html(QWeb.render('CrashManager.error', {session: instance.session, error: error})); }, on_javascript_exception: function(exception) { this.on_traceback({ @@ -269,7 +269,7 @@ instance.web.Loading = instance.web.Widget.extend({ this.count += increment; if (this.count > 0) { - if (instance.connection.debug) { + if (instance.session.debug) { this.$element.text(_.str.sprintf( _t("Loading (%d)"), this.count)); } else { this.$element.text(_t("Loading")); @@ -882,8 +882,8 @@ instance.web.UserMenu = instance.web.Widget.extend({ var func = new instance.web.Model("res.users").get_func("read"); return func(self.session.uid, ["name", "company_id"]).pipe(function(res) { var topbar_name = res.name; - if(instance.connection.debug) - topbar_name = _.str.sprintf("%s (%s)", topbar_name, instance.connection.db); + if(instance.session.debug) + topbar_name = _.str.sprintf("%s (%s)", topbar_name, instance.session.db); if(res.company_id[0] > 1) topbar_name = _.str.sprintf("%s (%s)", topbar_name, res.company_id[1]); self.$element.find('.oe_topbar_name').text(topbar_name); @@ -900,7 +900,7 @@ instance.web.UserMenu = instance.web.Widget.extend({ on_menu_settings: function() { var self = this; self.rpc("/web/action/load", { action_id: "base.action_res_users_my" }, function(result) { - result.result.res_id = instance.connection.uid; + result.result.res_id = instance.session.uid; self.getParent().action_manager.do_action(result.result); }); }, @@ -927,7 +927,7 @@ instance.web.Client = instance.web.Widget.extend({ }, start: function() { var self = this; - return instance.connection.session_bind(this.origin).pipe(function() { + return instance.session.session_bind(this.origin).pipe(function() { var $e = $(QWeb.render(self._template, {})); self.replaceElement($e); self.bind_events(); @@ -970,7 +970,7 @@ instance.web.Client = instance.web.Widget.extend({ show_common: function() { var self = this; this.crashmanager = new instance.web.CrashManager(); - instance.connection.on_rpc_error.add(this.crashmanager.on_rpc_error); + instance.session.on_rpc_error.add(this.crashmanager.on_rpc_error); self.notification = new instance.web.Notification(this); self.notification.appendTo(self.$element); self.loading = new instance.web.Loading(self); @@ -1067,7 +1067,7 @@ instance.web.WebClient = instance.web.Client.extend({ do_reload: function() { var self = this; return this.session.session_reload().pipe(function () { - instance.connection.load_modules(true).pipe( + instance.session.load_modules(true).pipe( self.menu.proxy('do_reload')); }); }, @@ -1174,7 +1174,7 @@ instance.web.EmbeddedClient = instance.web.Client.extend({ start: function() { var self = this; return $.when(this._super()).pipe(function() { - return instance.connection.session_authenticate(self.dbname, self.login, self.key, true).pipe(function() { + return instance.session.session_authenticate(self.dbname, self.login, self.key, true).pipe(function() { return self.rpc("/web/action/load", { action_id: self.action_id }, function(result) { var action = result.result; action.flags = _.extend({ diff --git a/addons/web/static/src/js/corelib.js b/addons/web/static/src/js/corelib.js index a46d6314ebe..5da12043994 100644 --- a/addons/web/static/src/js/corelib.js +++ b/addons/web/static/src/js/corelib.js @@ -692,7 +692,7 @@ instance.web.Widget = instance.web.Class.extend(instance.web.WidgetMixin, { instance.web.WidgetMixin.init.call(this,parent); // FIXME: this should not be this.setElement(this._make_descriptive()); - this.session = instance.connection; + this.session = instance.session; }, /** * Renders the element. The default implementation renders the widget using QWeb, @@ -841,7 +841,7 @@ instance.web.Widget = instance.web.Class.extend(instance.web.WidgetMixin, { rpc: function(url, data, success, error) { var def = $.Deferred().then(success, error); var self = this; - instance.connection.rpc(url, data). then(function() { + instance.session.rpc(url, data). then(function() { if (!self.isDestroyed()) def.resolve.apply(def, arguments); }, function() { @@ -863,7 +863,7 @@ instance.web.Registry = instance.web.Class.extend({ * * An object path is simply a dotted name from the instance root to the * object pointed to (e.g. ``"instance.web.Session"`` for an OpenERP - * connection object). + * session object). * * @constructs instance.web.Registry * @param {Object} mapping a mapping of keys to object-paths diff --git a/addons/web/static/src/js/coresetup.js b/addons/web/static/src/js/coresetup.js index 44e2d3aba78..d5b87d8a81d 100644 --- a/addons/web/static/src/js/coresetup.js +++ b/addons/web/static/src/js/coresetup.js @@ -514,7 +514,7 @@ $.async_when = function() { // special tweak for the web client var old_async_when = $.async_when; $.async_when = function() { - if (instance.connection.synch) + if (instance.session.synch) return $.when.apply(this, arguments); else return old_async_when.apply(this, arguments); @@ -559,7 +559,7 @@ instance.web.unblockUI = function() { } /** Setup default session */ -instance.connection = new instance.web.Session(); +instance.session = new instance.web.Session(); /** Configure default qweb */ instance.web._t = new instance.web.TranslationDataBase().build_translation_function(); @@ -578,8 +578,8 @@ instance.web._lt = function (s) { return {toString: function () { return instance.web._t(s); }} }; instance.web.qweb = new QWeb2.Engine(); -instance.web.qweb.default_dict['__debug__'] = instance.connection.debug; // Which one ? -instance.web.qweb.debug = instance.connection.debug; +instance.web.qweb.default_dict['__debug__'] = instance.session.debug; // Which one ? +instance.web.qweb.debug = instance.session.debug; instance.web.qweb.default_dict = { '_' : _, '_t' : instance.web._t @@ -636,7 +636,7 @@ var _t = instance.web._t; _t('%d years ago'); } -instance.connection.on('module_loaded', this, function () { +instance.session.on('module_loaded', this, function () { // provide timeago.js with our own translator method $.timeago.settings.translator = instance.web._t; }); diff --git a/addons/web/static/src/js/data.js b/addons/web/static/src/js/data.js index 1cdb4a713f1..e360c922918 100644 --- a/addons/web/static/src/js/data.js +++ b/addons/web/static/src/js/data.js @@ -58,7 +58,7 @@ instance.web.Query = instance.web.Class.extend({ }, _execute: function () { var self = this; - return instance.connection.rpc('/web/dataset/search_read', { + return instance.session.rpc('/web/dataset/search_read', { model: this._model.name, fields: this._fields || false, domain: this._model.domain(this._filter), @@ -233,7 +233,7 @@ instance.web.Model = instance.web.Class.extend(/** @lends openerp.web.Model# */{ kwargs = args; args = []; } - return instance.connection.rpc('/web/dataset/call_kw', { + return instance.session.rpc('/web/dataset/call_kw', { model: this.name, method: method, args: args, @@ -256,7 +256,7 @@ instance.web.Model = instance.web.Class.extend(/** @lends openerp.web.Model# */{ * @param {String} signal signal to trigger on the workflow */ exec_workflow: function (id, signal) { - return instance.connection.rpc('/web/dataset/exec_workflow', { + return instance.session.rpc('/web/dataset/exec_workflow', { model: this.name, id: id, signal: signal @@ -282,7 +282,7 @@ instance.web.Model = instance.web.Class.extend(/** @lends openerp.web.Model# */{ */ context: function (context) { return new instance.web.CompoundContext( - instance.connection.user_context, this._context, context || {}); + instance.session.user_context, this._context, context || {}); }, /** * Button action caller, needs to perform cleanup if an action is returned @@ -292,7 +292,7 @@ instance.web.Model = instance.web.Class.extend(/** @lends openerp.web.Model# */{ * FIXME: remove when evaluator integrated */ call_button: function (method, args) { - return instance.connection.rpc('/web/dataset/call_button', { + return instance.session.rpc('/web/dataset/call_button', { model: this.name, method: method, domain_id: null, diff --git a/addons/web/static/src/js/search.js b/addons/web/static/src/js/search.js index 0e3a5eb0dee..a7625631aa5 100644 --- a/addons/web/static/src/js/search.js +++ b/addons/web/static/src/js/search.js @@ -1613,7 +1613,7 @@ instance.web.search.CustomFilters = instance.web.search.Input.extend({ } var filter = { name: $name.val(), - user_id: private_filter ? instance.connection.uid : false, + user_id: private_filter ? instance.session.uid : false, model_id: self.view.model, context: results.context, domain: results.domain diff --git a/addons/web/static/src/js/test_support.js b/addons/web/static/src/js/test_support.js index d46366326b7..314a12c91c6 100644 --- a/addons/web/static/src/js/test_support.js +++ b/addons/web/static/src/js/test_support.js @@ -1,12 +1,12 @@ openerp.test_support = { - setup_connection: function (connection) { + setup_session: function (session) { var origin = location.protocol+"//"+location.host; - _.extend(connection, { + _.extend(session, { origin: origin, prefix: origin, server: origin, // keep chs happy //openerp.web.qweb.default_dict['_s'] = this.origin; - rpc_function: connection.rpc_json, + rpc_function: session.rpc_json, session_id: false, uid: false, username: false, @@ -22,7 +22,7 @@ openerp.test_support = { shortcuts: [], active_id: null }); - return connection.session_reload(); + return session.session_reload(); }, module: function (title, tested_core, nonliterals) { var conf = QUnit.config.openerp = {}; @@ -31,10 +31,10 @@ openerp.test_support = { QUnit.stop(); var oe = conf.openerp = window.openerp.init(); window.openerp.web[tested_core](oe); - var done = openerp.test_support.setup_connection(oe.connection); + var done = openerp.test_support.setup_session(oe.session); if (nonliterals) { done = done.pipe(function () { - return oe.connection.rpc('/tests/add_nonliterals', { + return oe.session.rpc('/tests/add_nonliterals', { domains: nonliterals.domains || [], contexts: nonliterals.contexts || [] }).then(function (r) { diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js index 17574caf90b..cfd01b7fbdd 100644 --- a/addons/web/static/src/js/view_form.js +++ b/addons/web/static/src/js/view_form.js @@ -1656,7 +1656,7 @@ instance.web.form.FormWidget = instance.web.Widget.extend(instance.web.form.Invi template = 'WidgetLabel.tooltip'; } return QWeb.render(template, { - debug: instance.connection.debug, + debug: instance.session.debug, widget: widget })}, gravity: $.fn.tipsy.autoBounds(50, 'nw'), @@ -1733,7 +1733,7 @@ instance.web.form.WidgetButton = instance.web.form.FormWidget.extend({ start: function() { this._super.apply(this, arguments); this.$element.click(this.on_click); - if (this.node.attrs.help || instance.connection.debug) { + if (this.node.attrs.help || instance.session.debug) { this.do_attach_tooltip(); } this.setupFocus(this.$element); @@ -1930,7 +1930,7 @@ instance.web.form.AbstractField = instance.web.form.FormWidget.extend(instance.w }, this)); } this.$label = this.view.$element.find('label[for=' + this.id_for_label + ']'); - if (instance.connection.debug) { + if (instance.session.debug) { this.do_attach_tooltip(this, this.$label[0] || this.$element); this.$label.off('dblclick').on('dblclick', function() { console.log("Field '%s' of type '%s' in View: %o", self.name, (self.node.attrs.widget || self.field.type), self.view); diff --git a/addons/web/static/src/js/view_list.js b/addons/web/static/src/js/view_list.js index 986b0e49faf..95dfa78fd63 100644 --- a/addons/web/static/src/js/view_list.js +++ b/addons/web/static/src/js/view_list.js @@ -2059,7 +2059,7 @@ instance.web.list.Button = instance.web.list.Column.extend({ title: this.string || '', additional_attributes: isNaN(row_data["id"].value) && instance.web.BufferedDataSet.virtual_id_regex.test(row_data["id"].value) ? 'disabled="disabled" class="oe_list_button_disabled"' : '', - prefix: instance.connection.prefix, + prefix: instance.session.prefix, icon: this.icon, alt: this.string || '' }); @@ -2086,7 +2086,7 @@ instance.web.list.Binary = instance.web.list.Column.extend({ var text = _t("Download"); var download_url = _.str.sprintf( '/web/binary/saveas?session_id=%s&model=%s&field=%s&id=%d', - instance.connection.session_id, options.model, this.id, options.id); + instance.session.session_id, options.model, this.id, options.id); if (this.filename) { download_url += '&filename_field=' + this.filename; if (row_data[this.filename]) { diff --git a/addons/web/static/test/evals.js b/addons/web/static/test/evals.js index 7bc6554e074..757d98c5bcc 100644 --- a/addons/web/static/test/evals.js +++ b/addons/web/static/test/evals.js @@ -12,7 +12,7 @@ $(document).ready(function () { // Context n should have base evaluation context + all of contexts // 0..n-1 in its own evaluation context var active_id = 4; - var result = openerp.connection.test_eval_contexts([ + var result = openerp.session.test_eval_contexts([ { "__contexts": [ { @@ -56,7 +56,7 @@ $(document).ready(function () { }); }); test('non-literal_eval_contexts', function () { - var result = openerp.connection.test_eval_contexts([{ + var result = openerp.session.test_eval_contexts([{ "__ref": "compound_context", "__contexts": [ {"__ref": "context", "__debug": "{'type':parent.type}", @@ -141,9 +141,9 @@ $(document).ready(function () { }); test('current_date', function () { var current_date = openerp.web.date_to_str(new Date()); - var result = openerp.connection.test_eval_domains( + var result = openerp.session.test_eval_domains( [[],{"__ref":"domain","__debug":"[('name','>=',current_date),('name','<=',current_date)]","__id":"5dedcfc96648"}], - openerp.connection.test_eval_get_context()); + openerp.session.test_eval_get_context()); deepEqual(result, [ ['name', '>=', current_date], ['name', '<=', current_date] diff --git a/addons/web/static/test/fulltest/dataset.js b/addons/web/static/test/fulltest/dataset.js index 9f7ab101869..b659d60b267 100644 --- a/addons/web/static/test/fulltest/dataset.js +++ b/addons/web/static/test/fulltest/dataset.js @@ -7,7 +7,7 @@ $(document).ready(function () { t.module('Dataset shortcuts', 'data'); t.test('read_index', function (openerp) { var ds = new openerp.web.DataSet( - {session: openerp.connection}, 'some.model'); + {session: openerp.session}, 'some.model'); ds.ids = [10, 20, 30, 40, 50]; ds.index = 2; t.expect(ds.read_index(['a', 'b', 'c']), function (result) { @@ -24,7 +24,7 @@ $(document).ready(function () { }); t.test('default_get', function (openerp) { var ds = new openerp.web.DataSet( - {session: openerp.connection}, 'some.model', {foo: 'bar'}); + {session: openerp.session}, 'some.model', {foo: 'bar'}); t.expect(ds.default_get(['a', 'b', 'c']), function (result) { strictEqual(result.method, 'default_get'); strictEqual(result.model, 'some.model'); @@ -38,7 +38,7 @@ $(document).ready(function () { }); }); t.test('create', function (openerp) { - var ds = new openerp.web.DataSet({session: openerp.connection}, 'some.model'); + var ds = new openerp.web.DataSet({session: openerp.session}, 'some.model'); t.expect(ds.create({foo: 1, bar: 2}), function (r) { strictEqual(r.method, 'create'); @@ -51,7 +51,7 @@ $(document).ready(function () { }); }); t.test('write', function (openerp) { - var ds = new openerp.web.DataSet({session: openerp.connection}, 'mod'); + var ds = new openerp.web.DataSet({session: openerp.session}, 'mod'); t.expect(ds.write(42, {foo: 1}), function (r) { strictEqual(r.method, 'write'); @@ -69,7 +69,7 @@ $(document).ready(function () { // }); }); t.test('unlink', function (openerp) { - var ds = new openerp.web.DataSet({session: openerp.connection}, 'mod'); + var ds = new openerp.web.DataSet({session: openerp.session}, 'mod'); t.expect(ds.unlink([42]), function (r) { strictEqual(r.method, 'unlink'); @@ -81,7 +81,7 @@ $(document).ready(function () { }); }); t.test('call', function (openerp) { - var ds = new openerp.web.DataSet({session: openerp.connection}, 'mod'); + var ds = new openerp.web.DataSet({session: openerp.session}, 'mod'); t.expect(ds.call('frob', ['a', 'b', 42]), function (r) { strictEqual(r.method, 'frob'); @@ -92,7 +92,7 @@ $(document).ready(function () { }); }); t.test('name_get', function (openerp) { - var ds = new openerp.web.DataSet({session: openerp.connection}, 'mod'); + var ds = new openerp.web.DataSet({session: openerp.session}, 'mod'); t.expect(ds.name_get([1, 2], null), function (r) { strictEqual(r.method, 'name_get'); @@ -104,7 +104,7 @@ $(document).ready(function () { }); }); t.test('name_search, name', function (openerp) { - var ds = new openerp.web.DataSet({session: openerp.connection}, 'mod'); + var ds = new openerp.web.DataSet({session: openerp.session}, 'mod'); t.expect(ds.name_search('bob'), function (r) { strictEqual(r.method, 'name_search'); @@ -119,7 +119,7 @@ $(document).ready(function () { }); }); t.test('name_search, domain & operator', function (openerp) { - var ds = new openerp.web.DataSet({session: openerp.connection}, 'mod'); + var ds = new openerp.web.DataSet({session: openerp.session}, 'mod'); t.expect(ds.name_search(0, [['foo', '=', 3]], 'someop'), function (r) { strictEqual(r.method, 'name_search'); @@ -134,7 +134,7 @@ $(document).ready(function () { }); }); t.test('exec_workflow', function (openerp) { - var ds = new openerp.web.DataSet({session: openerp.connection}, 'mod'); + var ds = new openerp.web.DataSet({session: openerp.session}, 'mod'); t.expect(ds.exec_workflow(42, 'foo'), function (r) { strictEqual(r['service'], 'object'); strictEqual(r.method, 'exec_workflow'); @@ -147,7 +147,7 @@ $(document).ready(function () { }); t.test('DataSetSearch#read_slice', function (openerp) { - var ds = new openerp.web.DataSetSearch({session: openerp.connection}, 'mod'); + var ds = new openerp.web.DataSetSearch({session: openerp.session}, 'mod'); t.expect(ds.read_slice(['foo', 'bar'], { domain: [['foo', '>', 42], ['qux', '=', 'grault']], context: {peewee: 'herman'}, @@ -167,7 +167,7 @@ $(document).ready(function () { }); }); t.test('DataSetSearch#read_slice sorted', function (openerp) { - var ds = new openerp.web.DataSetSearch({session: openerp.connection}, 'mod'); + var ds = new openerp.web.DataSetSearch({session: openerp.session}, 'mod'); ds.sort('foo'); ds.sort('foo'); ds.sort('bar'); @@ -194,7 +194,7 @@ $(document).ready(function () { }); t.test('Dataset', function (openerp) { var ds = new openerp.web.DataSetSearch( - {session: openerp.connection}, 'mod'); + {session: openerp.session}, 'mod'); var c = new openerp.web.CompoundContext( {a: 'foo', b: 3, c: 5}, openerp.contexts[0]); t.expect(ds.read_slice(['foo', 'bar'], { @@ -220,7 +220,7 @@ $(document).ready(function () { parent: {model: 'qux'} }; var ds = new openerp.web.DataSet( - {session: openerp.connection}, 'mod', + {session: openerp.session}, 'mod', new openerp.web.CompoundContext({}) .set_eval_context(eval_context)); var domain = new openerp.web.CompoundDomain(openerp.domains[0]) diff --git a/addons/web/static/test/list-editable.js b/addons/web/static/test/list-editable.js index 62f31a55833..2a4dee3b6e7 100644 --- a/addons/web/static/test/list-editable.js +++ b/addons/web/static/test/list-editable.js @@ -87,10 +87,10 @@ $(document).ready(function () { }); }); asyncTest('toggle-edition-save', 4, function () { - instance.connection.responses['/web/dataset/call_kw:create'] = function () { + instance.session.responses['/web/dataset/call_kw:create'] = function () { return { result: 42 }; }; - instance.connection.responses['/web/dataset/call_kw:read'] = function () { + instance.session.responses['/web/dataset/call_kw:read'] = function () { return { result: [{ id: 42, a: false, @@ -125,7 +125,7 @@ $(document).ready(function () { }) }); asyncTest('toggle-edition-cancel', 2, function () { - instance.connection.responses['/web/dataset/call_kw:create'] = function () { + instance.session.responses['/web/dataset/call_kw:create'] = function () { return { result: 42 }; }; var e = new instance.web.list.Editor({ @@ -153,7 +153,7 @@ $(document).ready(function () { }) }); asyncTest('toggle-save-required', 2, function () { - instance.connection.responses['/web/dataset/call_kw:create'] = function () { + instance.session.responses['/web/dataset/call_kw:create'] = function () { return { result: 42 }; }; var e = new instance.web.list.Editor({ @@ -191,7 +191,7 @@ $(document).ready(function () { baseSetup(); var records = {}; - _.extend(instance.connection.responses, { + _.extend(instance.session.responses, { '/web/listview/load': function () { return {result: { type: 'tree', @@ -227,7 +227,7 @@ $(document).ready(function () { }); asyncTest('newrecord', 6, function () { var got_defaults = false; - instance.connection.responses['/web/dataset/call_kw:default_get'] = function (params) { + instance.session.responses['/web/dataset/call_kw:default_get'] = function (params) { var fields = params.params.args[0]; deepEqual( fields, ['a', 'b', 'c'], @@ -267,7 +267,7 @@ $(document).ready(function () { module('list-edition-events', { setup: function () { baseSetup(); - _.extend(instance.connection.responses, { + _.extend(instance.session.responses, { '/web/listview/load': function () { return {result: { type: 'tree', diff --git a/addons/web/static/test/search.js b/addons/web/static/test/search.js index 548eef612b5..6dc37f31d08 100644 --- a/addons/web/static/test/search.js +++ b/addons/web/static/test/search.js @@ -164,8 +164,8 @@ $(document).ready(function () { instance.dummy = {}; instance.dummy.DummyWidget = instance.web.search.Field.extend( dummy_widget_attributes || {}); - if (!('/web/searchview/load' in instance.connection.responses)) { - instance.connection.responses['/web/searchview/load'] = function () { + if (!('/web/searchview/load' in instance.session.responses)) { + instance.session.responses['/web/searchview/load'] = function () { return {result: {fields_view: { type: 'search', fields: { @@ -186,10 +186,10 @@ $(document).ready(function () { }}}; }; } - instance.connection.responses['/web/searchview/get_filters'] = function () { + instance.session.responses['/web/searchview/get_filters'] = function () { return {result: []}; }; - instance.connection.responses['/web/searchview/fields_get'] = function () { + instance.session.responses['/web/searchview/fields_get'] = function () { return {result: {fields: { dummy: {type: 'char', string: 'Dummy'} }}}; @@ -321,7 +321,7 @@ $(document).ready(function () { {attrs: {name: 'dummy', string: 'Dummy'}}, {relation: 'dummy.model.name'}, view); - instance.connection.responses['/web/dataset/call_kw'] = function (req) { + instance.session.responses['/web/dataset/call_kw'] = function (req) { equal(req.params.method, 'name_get', "m2o should resolve default id"); equal(req.params.model, f.attrs.relation, @@ -357,7 +357,7 @@ $(document).ready(function () { {attrs: {name: 'dummy', string: 'Dummy'}}, {relation: 'dummy.model.name'}, view); - instance.connection.responses['/web/dataset/call_kw'] = function (req) { + instance.session.responses['/web/dataset/call_kw'] = function (req) { return {result: []}; }; f.facet_for_defaults({dummy: id}) @@ -573,7 +573,7 @@ $(document).ready(function () { }); }); asyncTest("M2O", 15, function () { - instance.connection.responses['/web/dataset/call_kw'] = function (req) { + instance.session.responses['/web/dataset/call_kw'] = function (req) { equal(req.params.method, "name_search"); equal(req.params.model, "dummy.model"); deepEqual(req.params.args, []); @@ -607,7 +607,7 @@ $(document).ready(function () { }); }); asyncTest("M2O no match", 5, function () { - instance.connection.responses['/web/dataset/call_kw'] = function (req) { + instance.session.responses['/web/dataset/call_kw'] = function (req) { equal(req.params.method, "name_search"); equal(req.params.model, "dummy.model"); deepEqual(req.params.args, []); @@ -1070,7 +1070,7 @@ $(document).ready(function () { }); asyncTest('checkboxing', 6, function () { var view = makeSearchView(); - instance.connection.responses['/web/searchview/get_filters'] = function () { + instance.session.responses['/web/searchview/get_filters'] = function () { return {result: [{ name: "filter name", user_id: 42 @@ -1099,7 +1099,7 @@ $(document).ready(function () { }); asyncTest('removal', 1, function () { var view = makeSearchView(); - instance.connection.responses['/web/searchview/get_filters'] = function () { + instance.session.responses['/web/searchview/get_filters'] = function () { return {result: [{ name: "filter name", user_id: 42 diff --git a/addons/web/static/test/testing.js b/addons/web/static/test/testing.js index e9525fc82a0..1be8e94e74b 100644 --- a/addons/web/static/test/testing.js +++ b/addons/web/static/test/testing.js @@ -33,28 +33,28 @@ openerp.testing = (function () { instance.web.qweb.add_template(doc); }, /** - * Alter provided instance's ``connection`` attribute to make response + * Alter provided instance's ``session`` attribute to make response * mockable: * * * The ``responses`` parameter can be used to provide a map of (RPC) * paths (e.g. ``/web/view/load``) to a function returning a response * to the query. - * * ``instance,connection`` grows a ``responses`` attribute which is + * * ``instance.session`` grows a ``responses`` attribute which is * a map of the same (and is in fact initialized to the ``responses`` * parameter if one is provided) * * Note that RPC requests to un-mocked URLs will be rejected with an * error message: only explicitly specified urls will get a response. * - * Mocked connections will *never* perform an actual RPC connection. + * Mocked sessions will *never* perform an actual RPC connection. * * @param instance openerp instance being initialized * @param {Object} [responses] */ mockifyRPC: function (instance, responses) { - var connection = instance.connection; - connection.responses = responses || {}; - connection.rpc_function = function (url, payload) { + var session = instance.session; + session.responses = responses || {}; + session.rpc_function = function (url, payload) { var fn = this.responses[url.url + ':' + payload.params.method] || this.responses[url.url]; diff --git a/addons/web_kanban/static/src/js/kanban.js b/addons/web_kanban/static/src/js/kanban.js index fe14b4c697f..6c70ecfb8ec 100644 --- a/addons/web_kanban/static/src/js/kanban.js +++ b/addons/web_kanban/static/src/js/kanban.js @@ -32,7 +32,7 @@ instance.web_kanban.KanbanView = instance.web.View.extend({ this.aggregates = {}; this.group_operators = ['avg', 'max', 'min', 'sum', 'count']; this.qweb = new QWeb2.Engine(); - this.qweb.debug = instance.connection.debug; + this.qweb.debug = instance.session.debug; this.qweb.default_dict = _.clone(QWeb.default_dict); this.has_been_loaded = $.Deferred(); this.search_domain = this.search_context = this.search_group_by = null; @@ -132,7 +132,7 @@ instance.web_kanban.KanbanView = instance.web.View.extend({ node.children = [{ tag: 'img', attrs: { - src: instance.connection.prefix + '/web/static/src/img/icons/' + node.attrs['data-icon'] + '.png', + src: instance.session.prefix + '/web/static/src/img/icons/' + node.attrs['data-icon'] + '.png', width: '16', height: '16' } @@ -760,7 +760,7 @@ instance.web_kanban.KanbanRecord = instance.web.Widget.extend({ url = "/web/static/src/img/placeholder.png"; } else { id = escape(JSON.stringify(id)); - url = instance.connection.prefix + '/web/binary/image?session_id=' + this.session.session_id + '&model=' + model + '&field=' + field + '&id=' + id; + url = instance.session.prefix + '/web/binary/image?session_id=' + this.session.session_id + '&model=' + model + '&field=' + field + '&id=' + id; if (cache !== undefined) { // Set the cache duration in seconds. url += '&cache=' + parseInt(cache, 10);