odoo
/
odoo
2
0
Fork 0
Code Pull Requests Releases Activity

[IMP] Include openerpframework in common assets. Add module list in bundle

This commit is contained in:
Fabien Meghazi 2014-05-12 17:18:12 +02:00
parent 27a6d2e9f4
commit f3c8cc50c8
2 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
addons/web/static/src/js/boot.js
View File

@ -22,7 +22,7 @@
// this unique id will be replaced by hostname_databasename by // this unique id will be replaced by hostname_databasename by
// openerp.web.Session on the first connection // openerp.web.Session on the first connection
_session_id: "instance0", _session_id: "instance0",
_modules: ['web'], _modules: openerp._modules || ['web'],
web_mobile: {}, web_mobile: {},
/** /**
* OpenERP instance constructor * OpenERP instance constructor
@ -30,8 +30,8 @@
* @param {Array|String} modules list of modules to initialize * @param {Array|String} modules list of modules to initialize
*/ */
init: function(modules) { init: function(modules) {
if (modules === null) { if (modules === undefined) {
modules = []; modules = openerp._modules;
} }
modules = _.without(modules, "web"); modules = _.without(modules, "web");
if (inited) if (inited)

10
addons/web/views/webclient_templates.xml
View File

@ -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/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"/> <link rel="stylesheet" href="/web/static/lib/fontawesome/css/font-awesome.css"/>
</template> </template>
@ -83,8 +89,6 @@
<link rel="stylesheet" href="/web/static/src/css/data_export.css"/> <link rel="stylesheet" href="/web/static/src/css/data_export.css"/>
<link rel="stylesheet" href="/base/static/src/css/modules.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/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/boot.js"></script>
<script type="text/javascript" src="/web/static/src/js/testing.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"/> <t t-call-assets="web.assets_backend"/>
<script type="text/javascript"> <script type="text/javascript">
$(function() { $(function() {
var s = new openerp.init(<t t-raw="modules"/>); var s = new openerp.init();
<t t-if="init"> <t t-if="init">
<t t-raw="init"/> <t t-raw="init"/>
</t> </t>