From 0fdda368713bde6df6a3d64e2827667043040f5d Mon Sep 17 00:00:00 2001 From: Xavier Morel Date: Wed, 7 Dec 2011 08:46:32 +0100 Subject: [PATCH] [REM] home installer lp bug: https://launchpad.net/bugs/901074 fixed bzr revid: xmo@openerp.com-20111207074632-x7j34by5hupukut1 --- .../web_dashboard/static/src/js/dashboard.js | 64 +------------------ .../static/src/xml/web_dashboard.xml | 32 ---------- addons/web_default_home/po/ar.po | 38 ----------- addons/web_default_home/po/da.po | 38 ----------- addons/web_default_home/po/de.po | 38 ----------- addons/web_default_home/po/es.po | 38 ----------- addons/web_default_home/po/es_EC.po | 38 ----------- addons/web_default_home/po/et.po | 38 ----------- addons/web_default_home/po/fr.po | 39 ----------- addons/web_default_home/po/gl.po | 38 ----------- addons/web_default_home/po/hr.po | 38 ----------- addons/web_default_home/po/it.po | 38 ----------- addons/web_default_home/po/nl.po | 38 ----------- addons/web_default_home/po/nl_BE.po | 38 ----------- addons/web_default_home/po/pl.po | 38 ----------- addons/web_default_home/po/ru.po | 38 ----------- addons/web_default_home/po/sk.po | 38 ----------- addons/web_default_home/po/sl.po | 38 ----------- 18 files changed, 3 insertions(+), 702 deletions(-) delete mode 100644 addons/web_default_home/po/ar.po delete mode 100644 addons/web_default_home/po/da.po delete mode 100644 addons/web_default_home/po/de.po delete mode 100644 addons/web_default_home/po/es.po delete mode 100644 addons/web_default_home/po/es_EC.po delete mode 100644 addons/web_default_home/po/et.po delete mode 100644 addons/web_default_home/po/fr.po delete mode 100644 addons/web_default_home/po/gl.po delete mode 100644 addons/web_default_home/po/hr.po delete mode 100644 addons/web_default_home/po/it.po delete mode 100644 addons/web_default_home/po/nl.po delete mode 100644 addons/web_default_home/po/nl_BE.po delete mode 100644 addons/web_default_home/po/pl.po delete mode 100644 addons/web_default_home/po/ru.po delete mode 100644 addons/web_default_home/po/sk.po delete mode 100644 addons/web_default_home/po/sl.po diff --git a/addons/web_dashboard/static/src/js/dashboard.js b/addons/web_dashboard/static/src/js/dashboard.js index f5adf6ec406..e79ccf7b4b6 100644 --- a/addons/web_dashboard/static/src/js/dashboard.js +++ b/addons/web_dashboard/static/src/js/dashboard.js @@ -375,25 +375,13 @@ openerp.web_dashboard.apps = { openerp.web_dashboard.ApplicationTiles = openerp.web.View.extend({ template: 'ApplicationTiles', start: function () { - var self = this; this._super(); - // Check for installed application - var Installer = new openerp.web.DataSet(this, 'base.setup.installer'); - Installer.call('default_get', [], function (installed_modules) { - var installed = _(installed_modules).any(function (active, name) { - return _.str.startsWith(name, 'cat') && active; }); - - if(installed) { - self.do_display_root_menu(); - } else { - self.do_display_installer(); - } - }); + return this.do_display_root_menu(); }, do_display_root_menu: function() { var self = this; - var dss = new openerp.web.DataSetSearch( this, 'ir.ui.menu', null, [['parent_id', '=', false]]); - var r = dss.read_slice( ['name', 'web_icon_data', 'web_icon_hover_data'], {}, function (applications) { + return new openerp.web.DataSetSearch( this, 'ir.ui.menu', null, [['parent_id', '=', false]]) + .read_slice( ['name', 'web_icon_data', 'web_icon_hover_data'], {}, function (applications) { // Create a matrix of 3*x applications var rows = []; while (applications.length) { @@ -406,52 +394,6 @@ openerp.web_dashboard.ApplicationTiles = openerp.web.View.extend({ openerp.webclient.menu.on_menu_click(null, $(this).data('menuid')) }); }); - return r; - }, - do_display_installer: function() { - var self = this; - var render_ctx = { - url: window.location.protocol + '//' + window.location.host + window.location.pathname, - session: self.session, - rows: openerp.web_dashboard.apps.applications - }; - var installer = QWeb.render('StaticHome', render_ctx); - self.$element.append(installer); - this.$element.delegate('.oe-static-home-tile-text button', 'click', function () { - self.install_module($(this).val()); - }); - }, - install_module: function (module_name) { - var self = this; - var Modules = new openerp.web.DataSetSearch( - this, 'ir.module.module', null, - [['name', '=', module_name], ['state', '=', 'uninstalled']]); - var Upgrade = new openerp.web.DataSet(this, 'base.module.upgrade'); - - $.blockUI(); - Modules.read_slice(['id'], {}, function (records) { - if (!(records.length === 1)) { $.unblockUI(); return; } - Modules.call('state_update', - [_.pluck(records, 'id'), 'to install', ['uninstalled']], - function () { - Upgrade.call('upgrade_module', [[]], function () { - self.run_configuration_wizards(); - }); - } - ) - }); - }, - run_configuration_wizards: function () { - var self = this; - new openerp.web.DataSet(this, 'res.config').call('start', [[]], function (action) { - self.widget_parent.widget_parent.do_action(action, function () { - openerp.webclient.do_reload(); - }); - self.$element.empty(); - self.do_display_root_menu().then(function () { - $.unblockUI(); - }); - }); } }); diff --git a/addons/web_dashboard/static/src/xml/web_dashboard.xml b/addons/web_dashboard/static/src/xml/web_dashboard.xml index 462334d2b83..038bccd606a 100644 --- a/addons/web_dashboard/static/src/xml/web_dashboard.xml +++ b/addons/web_dashboard/static/src/xml/web_dashboard.xml @@ -104,36 +104,4 @@