summaryrefslogtreecommitdiff
path: root/addons/web/views
diff options
context:
space:
mode:
authorFabien Meghazi <fme@openerp.com>2014-05-12 17:18:12 +0200
committerFabien Meghazi <fme@openerp.com>2014-05-12 17:18:12 +0200
commitf3c8cc50c8e59294d7b0f9c9dbda4a0d673a3d5e (patch)
treef9ece3d6e68e81b9063f68e27e08955f64206ef5 /addons/web/views
parent27a6d2e9f4ebf1449d4771219609d8483b2ba04e (diff)
[IMP] Include openerpframework in common assets. Add module list in bundle
Diffstat (limited to 'addons/web/views')
-rw-r--r--addons/web/views/webclient_templates.xml10
1 files changed, 7 insertions, 3 deletions
diff --git a/addons/web/views/webclient_templates.xml b/addons/web/views/webclient_templates.xml
index 66da9c3cd99..5a6c6aaea4c 100644
--- a/addons/web/views/webclient_templates.xml
+++ b/addons/web/views/webclient_templates.xml
@@ -20,6 +20,12 @@
<script type="text/javascript" src="/web/static/lib/jquery.ba-bbq/jquery.ba-bbq.js"></script>
+ <script type="text/javascript" src="/web/static/lib/qweb/qweb2.js"></script>
+ <script type="text/javascript" src="/web/static/src/js/openerpframework.js"></script>
+ <script type="text/javascript" charset="utf-8">
+ openerp._modules = <t t-raw="modules"/>;
+ </script>
+
<link rel="stylesheet" href="/web/static/lib/fontawesome/css/font-awesome.css"/>
</template>
@@ -83,8 +89,6 @@
<link rel="stylesheet" href="/web/static/src/css/data_export.css"/>
<link rel="stylesheet" href="/base/static/src/css/modules.css"/>
- <script type="text/javascript" src="/web/static/lib/qweb/qweb2.js"></script>
- <script type="text/javascript" src="/web/static/src/js/openerpframework.js"></script>
<script type="text/javascript" src="/web/static/lib/py.js/lib/py.js"></script>
<script type="text/javascript" src="/web/static/src/js/boot.js"></script>
<script type="text/javascript" src="/web/static/src/js/testing.js"></script>
@@ -136,7 +140,7 @@
<t t-call-assets="web.assets_backend"/>
<script type="text/javascript">
$(function() {
- var s = new openerp.init(<t t-raw="modules"/>);
+ var s = new openerp.init();
<t t-if="init">
<t t-raw="init"/>
</t>