[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
This commit is contained in:
Olivier Dony 2012-03-14 19:18:53 +01:00
parent 6a38a66d50
commit 601da46064
13 changed files with 14 additions and 14 deletions

View File

@ -7,7 +7,7 @@
This module provides the core of the OpenERP web client. This module provides the core of the OpenERP web client.
""", """,
"depends" : [], "depends" : [],
'active': True, 'auto_install': True,
'post_load' : 'wsgi_postload', 'post_load' : 'wsgi_postload',
'js' : [ 'js' : [
"static/lib/datejs/globalization/en-US.js", "static/lib/datejs/globalization/en-US.js",

View File

@ -537,10 +537,10 @@ class Session(openerpweb.Controller):
# already installed modules have no dependencies # already installed modules have no dependencies
modules = dict.fromkeys(loaded, []) 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', [])) modules.update((name, openerpweb.addons_manifest[name].get('depends', []))
for name in candidates for name in candidates
if openerpweb.addons_manifest[name].get('active')) if openerpweb.addons_manifest[name].get('auto_install'))
# Retrieve database installed modules # Retrieve database installed modules
Modules = req.session.model('ir.module.module') Modules = req.session.model('ir.module.module')

View File

@ -19,5 +19,5 @@
'qweb' : [ 'qweb' : [
"static/src/xml/*.xml", "static/src/xml/*.xml",
], ],
'active': True 'auto_install': True
} }

View File

@ -14,5 +14,5 @@
'qweb' : [ 'qweb' : [
"static/src/xml/*.xml", "static/src/xml/*.xml",
], ],
'active': True 'auto_install': True
} }

View File

@ -17,5 +17,5 @@
'qweb' : [ 'qweb' : [
"static/src/xml/*.xml", "static/src/xml/*.xml",
], ],
'active': True, 'auto_install': True,
} }

View File

@ -16,5 +16,5 @@
'qweb' : [ 'qweb' : [
"static/src/xml/*.xml", "static/src/xml/*.xml",
], ],
'active': True 'auto_install': True
} }

View File

@ -12,5 +12,5 @@
'qweb' : [ 'qweb' : [
"static/src/xml/*.xml", "static/src/xml/*.xml",
], ],
"active": True "auto_install": True
} }

View File

@ -9,6 +9,6 @@
"depends": [], "depends": [],
"js": ["static/*/*.js", "static/*/js/*.js"], "js": ["static/*/*.js", "static/*/js/*.js"],
"css": [], "css": [],
'active': False, 'auto_install': False,
'web_preload': False, 'web_preload': False,
} }

View File

@ -16,5 +16,5 @@
'qweb' : [ 'qweb' : [
"static/src/xml/*.xml", "static/src/xml/*.xml",
], ],
'active': True 'auto_install': True
} }

View File

@ -7,5 +7,5 @@
""", """,
"version" : "2.0", "version" : "2.0",
"depends" : [], "depends" : [],
'active': True, 'auto_install': True,
} }

View File

@ -16,5 +16,5 @@
'qweb': [ 'qweb': [
"static/src/xml/*.xml" "static/src/xml/*.xml"
], ],
'active': True 'auto_install': True
} }

View File

@ -5,7 +5,7 @@
"version" : "2.0", "version" : "2.0",
"depends" : [], "depends" : [],
"installable" : False, "installable" : False,
'active': False, 'auto_install': False,
'js' : [ 'js' : [
"../web/static/lib/datejs/date-en-US.js", "../web/static/lib/datejs/date-en-US.js",
"../web/static/lib/jquery/jquery-1.6.4.js", "../web/static/lib/jquery/jquery-1.6.4.js",

View File

@ -9,5 +9,5 @@
"depends": [], "depends": [],
"js": ["static/src/js/*.js"], "js": ["static/src/js/*.js"],
"css": ['static/src/css/*.css'], "css": ['static/src/css/*.css'],
'active': True, 'auto_install': True,
} }