diff options
| author | Vo Minh Thu <vmt@openerp.com> | 2012-01-18 11:12:52 +0100 |
|---|---|---|
| committer | Vo Minh Thu <vmt@openerp.com> | 2012-01-18 11:12:52 +0100 |
| commit | 75b3fc0907ee873c6e16d1fa8e8bfe58d4f520c1 (patch) | |
| tree | 3e7f7bbe9110eeae766b46bb9c16a867579b6452 /addons/web/controllers | |
| parent | 3203d264aecd751a8c261cea4f72fa323a3098be (diff) | |
| parent | 152f92916bc36d00c0e59fbc49fb655a4fd85908 (diff) | |
[MERGE] merged trunk.
bzr revid: vmt@openerp.com-20120118101252-e81nlyzym2nkebf4
Diffstat (limited to 'addons/web/controllers')
| -rw-r--r-- | addons/web/controllers/main.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/addons/web/controllers/main.py b/addons/web/controllers/main.py index 3a23556794a..a514cafb6c8 100644 --- a/addons/web/controllers/main.py +++ b/addons/web/controllers/main.py @@ -99,7 +99,7 @@ html_template = """<!DOCTYPE html> }); </script> </head> - <body></body> + <body class="openerp" id="oe"></body> </html> """ @@ -207,7 +207,7 @@ class WebClient(openerpweb.Controller): 'js': js, 'css': css, 'modules': simplejson.dumps(self.server_wide_modules(req)), - 'init': 'new s.web.WebClient().replace($("body"));', + 'init': 'new s.web.WebClient().start();', } return r @@ -933,7 +933,7 @@ class View(openerpweb.Controller): xml = self.transform_view(arch, session, evaluation_context) else: xml = ElementTree.fromstring(arch) - fvg['arch'] = common.xml2json.Xml2Json.convert_element(xml, preserve_whitespaces) + fvg['arch'] = common.xml2json.from_elementtree(xml, preserve_whitespaces) for field in fvg['fields'].itervalues(): if field.get('views'): |