diff --git a/addons/base/controllers/main.py b/addons/base/controllers/main.py index 45c500df7c9..aa870dfc78f 100644 --- a/addons/base/controllers/main.py +++ b/addons/base/controllers/main.py @@ -124,14 +124,14 @@ class Session(openerpweb.Controller): def jslist(self, req, mods='base'): return {'files': self.manifest_glob(mods.split(','), 'js')} - def css(self, req, mods='base,base_hello'): + def css(self, req, mods='base'): files = self.manifest_glob(mods.split(','), 'css') concat = self.concat_files(files)[0] # TODO request set the Date of last modif and Etag return concat css.exposed = True - def js(self, req, mods='base,base_hello'): + def js(self, req, mods='base'): files = self.manifest_glob(mods.split(','), 'js') concat = self.concat_files(files)[0] # TODO request set the Date of last modif and Etag diff --git a/addons/base_hello/__openerp__.py b/addons/base_hello/__openerp__.py index d52b5c82ec1..7a80645f3b8 100644 --- a/addons/base_hello/__openerp__.py +++ b/addons/base_hello/__openerp__.py @@ -4,4 +4,5 @@ "depends": [], "js": ["static/*/*.js", "static/*/js/*.js"], "css": [], + 'active': False, }