pengyuthon/odoo_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[IMP] Improve code to based on changes on web client for initialize mobile webclient.

Browse Source 
bzr revid: jra@tinyerp.com-20111229065727-egt8j4c2zlv3jh90
This commit is contained in:
=Bhumi Thakkar
2011-12-29 12:27:27 +05:30
committed by Jiten (OpenERP)
parent 4c9bc83fee
commit 1c03c37ad1
2 changed files with 31 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/web_mobile/static/src/js/chrome_mobile.js
+17 -8
View File
@@ -17,14 +17,17 @@ openerp.web_mobile.MobileWebClient = openerp.web.Widget.extend({
init: function(element_id) {
this._super(null, element_id);
openerp.web.qweb.add_template("xml/web_mobile.xml");
var params = {};
this.$element.html(this.render());
this.crashmanager = new openerp.web.CrashManager(this);
this.login = new openerp.web_mobile.Login(this, "oe_login");
},
start: function() {
this.login.start();
this._super.apply(this, arguments);
var self = this;
this.session.bind().then(function() {
openerp.web.qweb.add_template("xml/web_mobile.xml");
self.$element.html(self.render());
self.login.start();
});
}
});
@@ -45,7 +48,8 @@ openerp.web_mobile.Login = openerp.web.Widget.extend({
jQuery("#oe_header").children().remove();
this.rpc("/web/database/get_list", {}, function(result) {
self.db_list = result.db_list;
self.$element.html(self.render(self));
$('#'+self.element_id).html(self.render(self));
self.$element = $('#'+self.element_id);
if(self.session.db!=""){
self.$element.find("#database").val(self.session.db);
}
@@ -64,7 +68,7 @@ openerp.web_mobile.Login = openerp.web.Widget.extend({
var password = $e.find("div input[name=password]").val();
//$e.hide();
// Should hide then call callback
this.session.login(db, login, password, function() {
this.session.session_authenticate(db, login, password).then(function() {
if(self.session.session_is_valid()) {
if (self.has_local_storage) {
if(self.remember_creditentials) {
@@ -78,9 +82,13 @@ openerp.web_mobile.Login = openerp.web.Widget.extend({
}
}
self.on_login_valid();
} else {
}
});
this.session.on_session_invalid.add({
callback: function () {
self.on_login_invalid();
}
},
unique: true
});
},
on_login_invalid: function() {
@@ -185,6 +193,7 @@ openerp.web_mobile.Menu = openerp.web.Widget.extend({
this.menu = false;
},
start: function() {
this._super.apply(this, arguments);
this.rpc("/web/menu/load", {}, this.on_loaded);
},
on_loaded: function(data) {
addons/web_mobile/static/src/web_mobile.html
+14 -3
View File
@@ -13,6 +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_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>
@@ -26,10 +27,20 @@
<script type="text/javascript" src="/web/static/lib/qweb/qweb2.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/chrome.js"></script>
<script type="text/javascript" src="/web/static/src/js/data.js"></script>
<script type="text/javascript" src="/web/static/src/js/formats.js"></script>
<script type="text/javascript" src="/web/static/src/js/dates.js"></script>
<script type="text/javascript" src="/web/static/src/js/formats.js"></script>
<script type="text/javascript" src="/web/static/src/js/chrome.js"></script>
<script type="text/javascript" src="/web/static/src/js/views.js"></script>
<script type="text/javascript" src="/web/static/src/js/data.js"></script>
<script type="text/javascript" src="/web/static/src/js/data_export.js"></script>
<script type="text/javascript" src="/web/static/src/js/data_import.js"></script>
<script type="text/javascript" src="/web/static/src/js/search.js"></script>
<script type="text/javascript" src="/web/static/src/js/view_form.js"></script>
<script type="text/javascript" src="/web/static/src/js/view_page.js"></script>
<script type="text/javascript" src="/web/static/src/js/view_list.js"></script>
<script type="text/javascript" src="/web/static/src/js/view_list_editable.js"></script>
<script type="text/javascript" src="/web/static/src/js/view_tree.js"></script>
<script type="text/javascript" src="/web/static/src/js/view_editor.js"></script>
<script type="text/javascript" src="/web_mobile/static/src/js/web_mobile.js"></script>
<script type="text/javascript" src="/web_mobile/static/src/js/chrome_mobile.js"></script>