From 4c31251a43e6c45c502c51abf49fa59961971593 Mon Sep 17 00:00:00 2001 From: "Kunal Chavda (OpenERP)" Date: Tue, 6 Sep 2011 18:35:25 +0530 Subject: [FIX]Fixed code as par rename web from base and read file data problem. bzr revid: kch@tinyerp.com-20110906130525-axb8e40gc1zya9a3 --- addons/web/static/src/js/boot.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'addons/web/static/src/js/boot.js') diff --git a/addons/web/static/src/js/boot.js b/addons/web/static/src/js/boot.js index 2c00eb3d5a5..1846a2727ae 100644 --- a/addons/web/static/src/js/boot.js +++ b/addons/web/static/src/js/boot.js @@ -56,7 +56,7 @@ openerp.web = function(instance) { openerp.web.formats(instance); openerp.web.chrome(instance); openerp.web.data(instance); - var files = ["views","search","list","form","list_editable","web_mobile","view_tree","data_export"]; + var files = ["views","search","list","form","list_editable","web_mobile","view_tree","data_export","data_import"]; for(var i=0; i Date: Tue, 20 Sep 2011 17:43:58 +0200 Subject: [ADD] key in manifest allowing auto loading of modules bzr revid: chs@openerp.com-20110920154358-gpv2ahph6gbtlmiy --- addons/web/static/src/js/boot.js | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'addons/web/static/src/js/boot.js') diff --git a/addons/web/static/src/js/boot.js b/addons/web/static/src/js/boot.js index b9d5180b5c4..27dc4dcda5e 100644 --- a/addons/web/static/src/js/boot.js +++ b/addons/web/static/src/js/boot.js @@ -19,9 +19,9 @@ /** * OpenERP instance constructor * - * @param {Boolean} skip_init if true, skips the built-in initialization + * @param {Array} modules list of modules to initialize */ - init: function(skip_init) { + init: function(modules) { var new_instance = { // links to the global openerp _openerp: openerp, @@ -35,9 +35,9 @@ web_mobile: {} }; openerp.sessions[new_instance._session_id] = new_instance; - if (!skip_init){ - openerp.web(new_instance); - } + _.each(modules, function (element, index, list) { + openerp[element](new_instance); + }); return new_instance; } }; -- cgit v1.2.3