From 601da46064c243049b7dcc6203d8d8069e927aea Mon Sep 17 00:00:00 2001 From: Olivier Dony Date: Wed, 14 Mar 2012 19:18:53 +0100 Subject: [PATCH] [FIX] manifest flag 'active' was renamed to 'auto_install' a while ago The change occurred in server at revision 3989 and in addons at revision 6451, but had never been done in openerp-web. One indirect consequence was that the 'base' modules was not considered auto-installable anymore and its CSS files were not loaded on web, causing layout issues, namely in the modules kanban view. Server rev 3989 = al@openerp.com-20120130211001-ytqx759fl920uegc Addons rev 6451 = al@openerp.com-20120130211812-w0wu42hdu4l7koc4 lp bug: https://launchpad.net/bugs/948866 fixed bzr revid: odo@openerp.com-20120314181853-kzr6lgqxxcz7rreu --- addons/web/__openerp__.py | 2 +- addons/web/controllers/main.py | 4 ++-- addons/web_calendar/__openerp__.py | 2 +- addons/web_dashboard/__openerp__.py | 2 +- addons/web_diagram/__openerp__.py | 2 +- addons/web_gantt/__openerp__.py | 2 +- addons/web_graph/__openerp__.py | 2 +- addons/web_hello/__openerp__.py | 2 +- addons/web_kanban/__openerp__.py | 2 +- addons/web_mobile/__openerp__.py | 2 +- addons/web_process/__openerp__.py | 2 +- addons/web_rpc/__openerp__.py | 2 +- addons/web_tests/__openerp__.py | 2 +- 13 files changed, 14 insertions(+), 14 deletions(-) diff --git a/addons/web/__openerp__.py b/addons/web/__openerp__.py index 41a58cd3a07..c30043b5091 100644 --- a/addons/web/__openerp__.py +++ b/addons/web/__openerp__.py @@ -7,7 +7,7 @@ This module provides the core of the OpenERP web client. """, "depends" : [], - 'active': True, + 'auto_install': True, 'post_load' : 'wsgi_postload', 'js' : [ "static/lib/datejs/globalization/en-US.js", diff --git a/addons/web/controllers/main.py b/addons/web/controllers/main.py index a41663ceec2..6f289612099 100644 --- a/addons/web/controllers/main.py +++ b/addons/web/controllers/main.py @@ -537,10 +537,10 @@ class Session(openerpweb.Controller): # already installed modules have no dependencies modules = dict.fromkeys(loaded, []) - # Compute active true modules that might be on the web side only + # Compute auto_install modules that might be on the web side only modules.update((name, openerpweb.addons_manifest[name].get('depends', [])) for name in candidates - if openerpweb.addons_manifest[name].get('active')) + if openerpweb.addons_manifest[name].get('auto_install')) # Retrieve database installed modules Modules = req.session.model('ir.module.module') diff --git a/addons/web_calendar/__openerp__.py b/addons/web_calendar/__openerp__.py index 877e96d918f..62537ba2345 100644 --- a/addons/web_calendar/__openerp__.py +++ b/addons/web_calendar/__openerp__.py @@ -19,5 +19,5 @@ 'qweb' : [ "static/src/xml/*.xml", ], - 'active': True + 'auto_install': True } diff --git a/addons/web_dashboard/__openerp__.py b/addons/web_dashboard/__openerp__.py index 5f8be2b4e51..b739326e140 100644 --- a/addons/web_dashboard/__openerp__.py +++ b/addons/web_dashboard/__openerp__.py @@ -14,5 +14,5 @@ 'qweb' : [ "static/src/xml/*.xml", ], - 'active': True + 'auto_install': True } diff --git a/addons/web_diagram/__openerp__.py b/addons/web_diagram/__openerp__.py index 0d07a8b2b41..512c36d60e3 100644 --- a/addons/web_diagram/__openerp__.py +++ b/addons/web_diagram/__openerp__.py @@ -17,5 +17,5 @@ 'qweb' : [ "static/src/xml/*.xml", ], - 'active': True, + 'auto_install': True, } diff --git a/addons/web_gantt/__openerp__.py b/addons/web_gantt/__openerp__.py index 44ddf66b791..ee6b2d71d18 100644 --- a/addons/web_gantt/__openerp__.py +++ b/addons/web_gantt/__openerp__.py @@ -16,5 +16,5 @@ 'qweb' : [ "static/src/xml/*.xml", ], - 'active': True + 'auto_install': True } diff --git a/addons/web_graph/__openerp__.py b/addons/web_graph/__openerp__.py index 5a42ea381fe..6c62ffe4ede 100644 --- a/addons/web_graph/__openerp__.py +++ b/addons/web_graph/__openerp__.py @@ -12,5 +12,5 @@ 'qweb' : [ "static/src/xml/*.xml", ], - "active": True + "auto_install": True } diff --git a/addons/web_hello/__openerp__.py b/addons/web_hello/__openerp__.py index 198abd9f711..b7e17a520a8 100644 --- a/addons/web_hello/__openerp__.py +++ b/addons/web_hello/__openerp__.py @@ -9,6 +9,6 @@ "depends": [], "js": ["static/*/*.js", "static/*/js/*.js"], "css": [], - 'active': False, + 'auto_install': False, 'web_preload': False, } diff --git a/addons/web_kanban/__openerp__.py b/addons/web_kanban/__openerp__.py index 73e42a25e96..8a769342461 100644 --- a/addons/web_kanban/__openerp__.py +++ b/addons/web_kanban/__openerp__.py @@ -16,5 +16,5 @@ 'qweb' : [ "static/src/xml/*.xml", ], - 'active': True + 'auto_install': True } diff --git a/addons/web_mobile/__openerp__.py b/addons/web_mobile/__openerp__.py index 03526288cf6..ce76361f619 100644 --- a/addons/web_mobile/__openerp__.py +++ b/addons/web_mobile/__openerp__.py @@ -7,5 +7,5 @@ """, "version" : "2.0", "depends" : [], - 'active': True, + 'auto_install': True, } diff --git a/addons/web_process/__openerp__.py b/addons/web_process/__openerp__.py index 429572cc66d..b488ddb95d2 100644 --- a/addons/web_process/__openerp__.py +++ b/addons/web_process/__openerp__.py @@ -16,5 +16,5 @@ 'qweb': [ "static/src/xml/*.xml" ], - 'active': True + 'auto_install': True } diff --git a/addons/web_rpc/__openerp__.py b/addons/web_rpc/__openerp__.py index b77d8c7c1e2..f35f92c153e 100644 --- a/addons/web_rpc/__openerp__.py +++ b/addons/web_rpc/__openerp__.py @@ -5,7 +5,7 @@ "version" : "2.0", "depends" : [], "installable" : False, - 'active': False, + 'auto_install': False, 'js' : [ "../web/static/lib/datejs/date-en-US.js", "../web/static/lib/jquery/jquery-1.6.4.js", diff --git a/addons/web_tests/__openerp__.py b/addons/web_tests/__openerp__.py index a4a888edc99..dc26ecc42ad 100644 --- a/addons/web_tests/__openerp__.py +++ b/addons/web_tests/__openerp__.py @@ -9,5 +9,5 @@ "depends": [], "js": ["static/src/js/*.js"], "css": ['static/src/css/*.css'], - 'active': True, + 'auto_install': True, }