[FIX] thunderbird plugin: update the opening url

bzr revid: chs@openerp.com-20111220161228-7nd4f10j284vw7wn

diff --git a/addons/thunderbird/plugin/openerp_plugin.xpi b/addons/thunderbird/plugin/openerp_plugin.xpi
index 367a4fa..167e7c5 100644 (file)
Binary files a/addons/thunderbird/plugin/openerp_plugin.xpi and b/addons/thunderbird/plugin/openerp_plugin.xpi differ

diff --git a/addons/thunderbird/plugin/openerp_plugin/chrome/openerp_plugin.jar b/addons/thunderbird/plugin/openerp_plugin/chrome/openerp_plugin.jar
index 28b7061..0d4cc3a 100644 (file)
Binary files a/addons/thunderbird/plugin/openerp_plugin/chrome/openerp_plugin.jar and b/addons/thunderbird/plugin/openerp_plugin/chrome/openerp_plugin.jar differ

diff --git a/addons/thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/content/overlay.js b/addons/thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/content/overlay.js
index fde29df..bbfad86 100644 (file)
--- a/addons/thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/content/overlay.js
+++ b/addons/thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/content/overlay.js
@@ -169,6 +169,16 @@ function searchmail()
 }\r
 \r
 \r
+function url_for(model, id) {\r
+    var base = getWebServerURL(),\r
+        db = getDbName(),\r
+        login = getusername(),\r
+        password = getPassword();\r
+\r
+    return base + '/web/webclient/login?db='+db+'&login='+login+'&key='+password+'#model='+model+'&id='+id;\r
+    \r
+}\r
+\r
 var openPartnerHandler = {\r
     onResult: function(client, context, result) {\r
         netscape.security.PrivilegeManager.enablePrivilege('UniversalXPConnect UniversalBrowserAccess');\r
@@ -186,15 +196,11 @@ var openPartnerHandler = {
             } \r
             if(strlSearchResult=="partner_id"){\r
                 partner_id = strlSearchResultValue;\r
-                weburl = getWebServerURL();\r
 \r
                 if (parseInt(partner_id) > 0){\r
-                    //Encode the url and form an url to have menu in webclient\r
-                    var encoded = encodeURIComponent("/openerp/form/view?model=res.partner&id="+partner_id)\r
-                    var t = weburl + "?next=" + encoded\r
                     var messenger = Components.classes["@mozilla.org/messenger;1"].createInstance();\r
                     messenger = messenger.QueryInterface(Components.interfaces.nsIMessenger);\r
-                    messenger.launchExternalURL(t);\r
+                    messenger.launchExternalURL(url_for('res.partner', partner_id));\r
                 }\r
                 else{\r
                     alert("Partner is not Available.");\r
@@ -298,7 +304,6 @@ var listDocumentHandler = {
         var res = result.QueryInterface(Components.interfaces.nsISupportsArray);\r
         res_id = res.QueryElementAt(1, Components.interfaces.nsISupportsPRInt32);\r
         model = res.QueryElementAt(0, Components.interfaces.nsISupportsCString); \r
-        weburl = getWebServerURL();\r
         if(res_id==0)\r
         {\r
             alert("Document is not available.");\r
@@ -307,11 +312,9 @@ var listDocumentHandler = {
         else\r
         {\r
     \r
-            var encoded = encodeURIComponent("/openerp/form/view?model=" + model +"&id=" + res_id)\r
-            var t = weburl + "?next=" + encoded\r
             var messenger = Components.classes["@mozilla.org/messenger;1"].createInstance();\r
             messenger = messenger.QueryInterface(Components.interfaces.nsIMessenger);\r
-            messenger.launchExternalURL(t);\r
+            messenger.launchExternalURL(url_for(model, res_id));\r
         }\r
 \r
     },\r