[MERGE] [FIX] Properly escape values in templates
lp bug: https://launchpad.net/bugs/1118593 fixed bzr revid: fme@openerp.com-20130213110100-icz81b7fpwt6s8s8
This commit is contained in:
commit
19739db1ba
|
@ -32,12 +32,12 @@ NOMODULE_TEMPLATE = Template(u"""<!DOCTYPE html>
|
||||||
</form>
|
</form>
|
||||||
</body>
|
</body>
|
||||||
</html>
|
</html>
|
||||||
""")
|
""", default_filters=['h'])
|
||||||
NOTFOUND = Template(u"""
|
NOTFOUND = Template(u"""
|
||||||
<p>Unable to find the module [${module}], please check that the module
|
<p>Unable to find the module [${module}], please check that the module
|
||||||
name is correct and the module is on OpenERP's path.</p>
|
name is correct and the module is on OpenERP's path.</p>
|
||||||
<a href="/web/tests"><< Back to tests</a>
|
<a href="/web/tests"><< Back to tests</a>
|
||||||
""")
|
""", default_filters=['h'])
|
||||||
TESTING = Template(u"""<!DOCTYPE html>
|
TESTING = Template(u"""<!DOCTYPE html>
|
||||||
<html style="height: 100%">
|
<html style="height: 100%">
|
||||||
<%def name="to_path(module, p)">/${module}/${p}</%def>
|
<%def name="to_path(module, p)">/${module}/${p}</%def>
|
||||||
|
@ -51,9 +51,9 @@ TESTING = Template(u"""<!DOCTYPE html>
|
||||||
<script src="/web/static/lib/qunit/qunit.js"></script>
|
<script src="/web/static/lib/qunit/qunit.js"></script>
|
||||||
|
|
||||||
<script type="text/javascript">
|
<script type="text/javascript">
|
||||||
var oe_db_info = ${db_info};
|
var oe_db_info = ${db_info | n};
|
||||||
// List of modules, each module is preceded by its dependencies
|
// List of modules, each module is preceded by its dependencies
|
||||||
var oe_all_dependencies = ${dependencies};
|
var oe_all_dependencies = ${dependencies | n};
|
||||||
QUnit.config.testTimeout = 5 * 60 * 1000;
|
QUnit.config.testTimeout = 5 * 60 * 1000;
|
||||||
</script>
|
</script>
|
||||||
</head>
|
</head>
|
||||||
|
@ -83,7 +83,7 @@ TESTING = Template(u"""<!DOCTYPE html>
|
||||||
% endif
|
% endif
|
||||||
% endfor
|
% endfor
|
||||||
</html>
|
</html>
|
||||||
""")
|
""", default_filters=['h'])
|
||||||
|
|
||||||
class TestRunnerController(http.Controller):
|
class TestRunnerController(http.Controller):
|
||||||
_cp_path = '/web/tests'
|
_cp_path = '/web/tests'
|
||||||
|
|
Loading…
Reference in New Issue