From eb5a5bf838fdeac8564802f3b08fbfad6066e8e7 Mon Sep 17 00:00:00 2001
From: Christophe Simonis <chs@openerp.com>
Date: Wed, 14 Nov 2012 18:41:50 +0100
Subject: [IMP] add method session.url() to generate correct url

bzr revid: chs@openerp.com-20121114174150-9nhj50vftt4lrf0k
---
 addons/web/static/src/js/corelib.js | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

(limited to 'addons/web/static/src/js/corelib.js')

diff --git a/addons/web/static/src/js/corelib.js b/addons/web/static/src/js/corelib.js
index 879cf94dcdd..6ea0fd53372 100644
--- a/addons/web/static/src/js/corelib.js
+++ b/addons/web/static/src/js/corelib.js
@@ -1320,7 +1320,7 @@ instance.web.JsonRPC = instance.web.Class.extend(instance.web.PropertiesMixin, {
             }
         };
 
-        url.url = this.get_url(url.url);
+        url.url = this.url(url.url, null);
         var ajax = _.extend({
             type: "GET",
             dataType: 'jsonp', 
@@ -1376,8 +1376,17 @@ instance.web.JsonRPC = instance.web.Class.extend(instance.web.PropertiesMixin, {
             return deferred.done(set_sid);
         }
     },
-    get_url: function (file) {
-        return this.prefix + file;
+
+    url: function(path, params) {
+        var qs = '';
+        if (!_.isNull(params)) {
+            params = _.extend(params || {}, {session_id: this.session_id});
+            if (this.httpsessionid) {
+                params.sid = this.httpsessionid;
+            }
+            qs = '?' + $.param(params);
+        }
+        return this.prefix + path + qs;
     },
 });
 
-- 
cgit v1.2.3