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

[FIX] mobile client breakage from a bunch of changes only set in the main client 

Culprit commits:
* fme@openerp.com-20120214105145-pat0srumt8m7nq38 (update of jquery-ui timepicker, move of its files)
* xmo@openerp.com-20120227073721-nkgeiqacbzch8xev (update & rename of py.parse to py.js)
* nicolas.vanhoren@openerp.com-20120229111140-ta8fwqzdjwm2br88 (extract stuff to un-linked library, rename methods)

lp bug: https://launchpad.net/bugs/943697 fixed

bzr revid: xmo@openerp.com-20120301112627-24ipmxfosd9xin8o
This commit is contained in:
Xavier Morel 2012-03-01 12:26:27 +01:00
parent 4a6776d7a1
commit e87a05f9a9
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
addons/web_mobile/static/src/js/chrome_mobile.js
View File

@ -23,7 +23,7 @@ openerp.web_mobile.MobileWebClient = openerp.web.OldWidget.extend({
start: function() {
this._super.apply(this, arguments);
var self = this;
this.session.bind().then(function() {
this.session.bind_session().then(function() {
openerp.web.qweb.add_template("xml/web_mobile.xml");
self.$element.html(self.render());
self.login.start();

5
addons/web_mobile/static/src/web_mobile.html
View File

@ -13,7 +13,7 @@
<script type="text/javascript" src="/web/static/lib/jquery.ba-bbq/jquery.ba-bbq.js"></script>
<script type="text/javascript" src="/web/static/lib/underscore/underscore.js"></script>
<script type="text/javascript" src="/web/static/lib/underscore/underscore.string.js"></script>
<script type="text/javascript" src="/web/static/lib/py.parse/lib/py.js"></script>
<script type="text/javascript" src="/web/static/lib/py.js/lib/py.js"></script>
<script type="text/javascript" src="/web_mobile/static/lib/jquery_mobile/js/jquery.mobile-1.0a4.1.js"></script>
<script type="text/javascript" src="/web/static/lib/datejs/globalization/en-US.js"></script>
@ -22,9 +22,10 @@
<script type="text/javascript" src="/web/static/lib/datejs/parser.js"></script>
<script type="text/javascript" src="/web/static/lib/datejs/sugarpak.js"></script>
<script type="text/javascript" src="/web/static/lib/datejs/time.js"></script>
<script type="text/javascript" src="/web/static/lib/jquery.ui/js/jquery-ui-timepicker-addon.js"></script>
<script type="text/javascript" src="/web/static/lib/jquery.ui.timepicker/js/jquery-ui-timepicker-addon.js"></script>
<script type="text/javascript" src="/web/static/lib/qweb/qweb2.js"></script>
<script type="text/javascript" src="/web/static/lib/novajs/src/nova.js"></script>
<script type="text/javascript" src="/web/static/src/js/boot.js"></script>
<script type="text/javascript" src="/web/static/src/js/core.js"></script>
<script type="text/javascript" src="/web/static/src/js/dates.js"></script>