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

apps dont break protocol 

bzr revid: al@openerp.com-20121219023226-gfceiyrmi50my80e
This commit is contained in:
Antony Lesuisse 2012-12-19 03:32:26 +01:00
parent 0c7f17c0ac
commit edef11eaaf
2 changed files with 5 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
openerp/addons/base/static/src/js/apps.js
View File

@ -42,11 +42,8 @@ openerp.base = function(instance) {
if (instance.base.apps._client) {
return check_client_available(instance.base.apps._client);
} else {
//var DEFAULT_SERVER = 'http://apps.openerp.com/loempia'; // PROD
var DEFAULT_SERVER = 'http://apps.v7.openerp.com:8069/apps'; // TEST
//var DEFAULT_SERVER = 'http://localhost:8080/trunk_loempia7'; // DEV
var ICP = new instance.web.Model('ir.config_parameter');
return ICP.call('get_param', ['loempia.server', DEFAULT_SERVER]).then(function(u) {
return ICP.call('get_param', ['apps.server', 'https://apps.openerp.com/apps']).then(function(u) {
var link = $(_.str.sprintf('<a href="%s"></a>', u))[0];
var host = _.str.sprintf('%s//%s', link.protocol, link.host);
var dbname = link.pathname;

12
openerp/service/web_services.py
View File

@ -55,14 +55,10 @@ from openerp import SUPERUSER_ID
_logger = logging.getLogger(__name__)
RPC_VERSION_1 = {
'openerp': {
'version': release.version,
'version_info': release.version_info,
'serie': release.serie,
},
'protocol': {
'version': 1
},
'server_version': release.version,
'server_version_info': release.version_info,
'server_serie': release.serie,
'protocol_version': 1,
}
# This should be moved to openerp.modules.db, along side initialize().