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

[FIX] Resolve the problems which accured after merge main web. 

bzr revid: jra@tinyerp.com-20110907123031-gzgz3k0b2w89au8u
This commit is contained in:
Jiten (OpenERP) 2011-09-07 18:00:31 +05:30
parent dad60c2f9c
commit 8a040a8e04
5 changed files with 19 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
addons/web_mobile/controllers/__init__.py
View File

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

@ -17,8 +17,8 @@ openerp.web_mobile.MobileWebClient = openerp.web.Widget.extend({
QWeb.add_template("xml/web_mobile.xml");
var params = {};
this.$element.html(QWeb.render("WebClient", {}));
this.session = new openerp.base.Session("oe_errors");
this.crashmanager = new openerp.base.CrashManager(this);
this.session = new openerp.web.Session("oe_errors");
this.crashmanager = new openerp.web.CrashManager(this);
this.login = new openerp.web_mobile.Login(this, "oe_login");
// this.session.on_session_invalid.add(this.login.do_ask_login);
},
@ -85,7 +85,7 @@ openerp.web_mobile.Login = openerp.web.Widget.extend({
}
});
openerp.web_mobile.Header = openerp.base.Widget.extend({
openerp.web_mobile.Header = openerp.web.Widget.extend({
init: function(session, element_id) {
this._super(session, element_id);
},
@ -95,7 +95,7 @@ openerp.web_mobile.Header = openerp.base.Widget.extend({
}
});
openerp.web_mobile.Footer = openerp.base.Widget.extend({
openerp.web_mobile.Footer = openerp.web.Widget.extend({
init: function(session, element_id) {
this._super(session, element_id);
},
@ -201,7 +201,7 @@ openerp.web_mobile.Menu = openerp.web.Widget.extend({
this.secondary.start();
}
});
openerp.web_mobile.Secondary = openerp.base.Widget.extend({
openerp.web_mobile.Secondary = openerp.web.Widget.extend({
init: function(session, element_id, secondary_menu_id) {
this._super(session, element_id);
this.data = secondary_menu_id;

4
addons/web_mobile/static/src/js/form_mobile.js
View File

@ -88,7 +88,7 @@ openerp.web_mobile.FormView = openerp.web.Widget.extend({
//$.mobile.changePage($("#oe_form"), "slide", true, true);
/*next.find('.detail').find('li').click(function(){
if(data[relational]){
var dataset = new openerp.base.DataSetStatic(self, result.fields_view.fields[relational].relation, result.fields_view.fields[relational].context);
var dataset = new openerp.web.DataSetStatic(self, result.fields_view.fields[relational].relation, result.fields_view.fields[relational].context);
dataset.domain=[['id', 'in', data[relational]]];
dataset.name_search('', dataset.domain, 'in',false ,function(res){
for(var i=0;i<res.length;i++){
@ -98,7 +98,7 @@ openerp.web_mobile.FormView = openerp.web.Widget.extend({
self.$element.html(QWeb.render("ListView", {'records' : res}));
self.$element.find("#searchid").focus();
self.$element.find("a#list-id").click(function(ev){
dataset = new openerp.base.DataSetSearch(self, dataset.model, null, null);
dataset = new openerp.web.DataSetSearch(self, dataset.model, null, null);
dataset.read_slice([],{}, function (result_relational) {
for (var i = 0; i < result_relational.length; i++) {
if (result_relational[i].id == $(ev.currentTarget).data('id')) {

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

@ -22,7 +22,7 @@ openerp.web_mobile.ListView = openerp.web.Widget.extend({
},
on_search_data: function(ev){
var self = this;
var dataset = new openerp.base.DataSetStatic(this, this.action.res_model, this.action.context);
var dataset = new openerp.web.DataSetStatic(this, this.action.res_model, this.action.context);
dataset.name_search('', [], 'ilike',false ,function(result){
self.$element.html(QWeb.render("ListView", {'records' : result}));
self.$element.find("#header").find('h1').html(self.action.name);

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

@ -7,19 +7,19 @@
<link rel="stylesheet" href="/web_mobile/static/lib/jquery_mobile/css/jquery.mobile-1.0a4.1.css"/>
<link rel="stylesheet" href="/web_mobile/static/src/css/web_mobile.css"/>
<script type="text/javascript" src="/base/static/lib/jquery/jquery-1.6.2.js"></script>
<script type="text/javascript" src="/base/static/lib/jquery.ui/js/jquery-ui-1.8.9.custom.min.js"></script>
<script type="text/javascript" src="/base/static/lib/jquery.ba-bbq/jquery.ba-bbq.js"></script>
<script type="text/javascript" src="/base/static/lib/underscore/underscore.js"></script>
<script type="text/javascript" src="/base/static/lib/underscore/underscore.string.js"></script>
<script type="text/javascript" src="/web/static/lib/jquery/jquery-1.6.2.js"></script>
<script type="text/javascript" src="/web/static/lib/jquery.ui/js/jquery-ui-1.8.9.custom.min.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/underscore/underscore.js"></script>
<script type="text/javascript" src="/web/static/lib/underscore/underscore.string.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="/base/static/lib/qweb/qweb2.js"></script>
<script type="text/javascript" src="/base/static/src/js/boot.js"></script>
<script type="text/javascript" src="/base/static/src/js/core.js"></script>
<script type="text/javascript" src="/base/static/src/js/chrome.js"></script>
<script type="text/javascript" src="/base/static/src/js/data.js"></script>
<script type="text/javascript" src="/base/static/src/js/formats.js"></script>
<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_mobile/static/src/js/web_mobile.js"></script>
<script type="text/javascript" src="/web_mobile/static/src/js/chrome_mobile.js"></script>