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

[FIX] Thunderbird false negative testing connection 

bzr revid: tfr@openerp.com-20110125125111-sumkqbrljcn3ayiu
This commit is contained in:
Thibault Francois 2011-01-25 13:51:11 +01:00
parent 5a20b4cf7b
commit 0aa7654d6d
3 changed files with 6 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
addons/thunderbird/plugin/openerp_plugin.xpi
View File

Binary file not shown.

BIN
addons/thunderbird/plugin/openerp_plugin/chrome/openerp_plugin.jar
View File

Binary file not shown.

17
addons/thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/content/tiny_xmlrpc.js
View File

@ -612,7 +612,6 @@ function createMenuItem_db(aLabel) {
//xmlrpc request handler for getting the list of database //xmlrpc request handler for getting the list of database
var listDbHandler = { var listDbHandler = {
onResult: function(client, context, result) { onResult: function(client, context, result) {
setconnect_server("true")
netscape.security.PrivilegeManager.enablePrivilege('UniversalXPConnect UniversalBrowserAccess'); netscape.security.PrivilegeManager.enablePrivilege('UniversalXPConnect UniversalBrowserAccess');
var arrMethodList = result.QueryInterface(Components.interfaces.nsISupportsArray); var arrMethodList = result.QueryInterface(Components.interfaces.nsISupportsArray);
// Set the number of results // Set the number of results
@ -625,7 +624,7 @@ var listDbHandler = {
var database = "" var database = ""
if (count > 0) if (count > 0)
{ {
setDBList("true") setDBList("true");
var label = document.getElementById("database_option"); var label = document.getElementById("database_option");
var vbox = document.createElement("vbox"); var vbox = document.createElement("vbox");
var hbox = document.createElement("hbox"); var hbox = document.createElement("hbox");
@ -658,7 +657,7 @@ var listDbHandler = {
} }
else else
{ {
setDBList("false") setDBList("false");
} }
// Loop through the results, adding items to the list // Loop through the results, adding items to the list
if (count) if (count)
@ -686,18 +685,14 @@ var listDbHandler = {
}, },
onError: function (client, ctxt, status, errorMsg) { onError: function (client, ctxt, status, errorMsg) {
if(status == 0) { setDBList("false");
setconnect_server("true");
setDBList("false");
}
} }
}; };
//function to get the database list //function to get the database list
function getDbList(argControl) function getDbList(argControl)
{ {
setDBList("false") setDBList("true");
setconnect_server("false") setconnect_server("true");
// Enable correct security // Enable correct security
netscape.security.PrivilegeManager.enablePrivilege('UniversalXPConnect UniversalBrowserAccess'); netscape.security.PrivilegeManager.enablePrivilege('UniversalXPConnect UniversalBrowserAccess');
// Get the instance of the XML-RPC client // Get the instance of the XML-RPC client
@ -1845,7 +1840,6 @@ function testConnection(){
function testConnection_web(){ function testConnection_web(){
var branchobj = getPref(); var branchobj = getPref();
weburl = getWebServerURL(); weburl = getWebServerURL();
// window.open(weburl, "", "chrome","resizable=yes,scrollbars=yes,status=yes");
var messenger = Components.classes["@mozilla.org/messenger;1"].createInstance(); var messenger = Components.classes["@mozilla.org/messenger;1"].createInstance();
messenger = messenger.QueryInterface(Components.interfaces.nsIMessenger); messenger = messenger.QueryInterface(Components.interfaces.nsIMessenger);
messenger.launchExternalURL(weburl); messenger.launchExternalURL(weburl);
@ -1877,6 +1871,7 @@ var listcreateLoginHandler = {
//function to check the login information //function to check the login information
function createConnection(){ function createConnection(){
setconnect_server("true");
var branchobj = getPref(); var branchobj = getPref();
setServerService('xmlrpc/common'); setServerService('xmlrpc/common');
netscape.security.PrivilegeManager.enablePrivilege('UniversalXPConnect UniversalBrowserAccess'); netscape.security.PrivilegeManager.enablePrivilege('UniversalXPConnect UniversalBrowserAccess');