From 6a22efdef027c4c10937bda52b344efc6aaaca16 Mon Sep 17 00:00:00 2001
From: niv-openerp <nicolas.vanhoren@openerp.com>
Date: Mon, 25 Jul 2011 14:09:40 +0200
Subject: [fix] wrong storage of session cookie

bzr revid: nicolas.vanhoren@openerp.com-20110725120940-f6vfi6wu6xy9js8x
---
 addons/base/static/src/js/chrome.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'addons/base/static/src/js/chrome.js')

diff --git a/addons/base/static/src/js/chrome.js b/addons/base/static/src/js/chrome.js
index 67738d7a348..492e7c62b5d 100644
--- a/addons/base/static/src/js/chrome.js
+++ b/addons/base/static/src/js/chrome.js
@@ -425,7 +425,7 @@ openerp.base.Session = openerp.base.Controller.extend( /** @lends openerp.base.S
         for(var i=0; i<cookies.length; ++i) {
             var cookie = cookies[i].replace(/^\s*/, '');
             if(cookie.indexOf(nameEQ) === 0) {
-                return decodeURIComponent(cookie.substring(nameEQ.length));
+                return JSON.parse(decodeURIComponent(cookie.substring(nameEQ.length)));
             }
         }
         return null;
@@ -441,7 +441,7 @@ openerp.base.Session = openerp.base.Controller.extend( /** @lends openerp.base.S
     set_cookie: function (name, value, ttl) {
         ttl = ttl || 24*60*60*365;
         document.cookie = [
-            this.element_id + '|' + name + '=' + encodeURIComponent(value),
+            this.element_id + '|' + name + '=' + encodeURIComponent(JSON.stringify(value)),
             'max-age=' + ttl,
             'expires=' + new Date(new Date().getTime() + ttl*1000).toGMTString()
         ].join(';');
-- 
cgit v1.2.3


From f8b552e5b5d3ea96e49e3493479c318c4d715411 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Mon, 25 Jul 2011 16:06:56 +0200
Subject: [FIX] session initialization

bzr revid: xmo@openerp.com-20110725140656-ow3mr78psuianqyc
---
 addons/base/static/src/js/chrome.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'addons/base/static/src/js/chrome.js')

diff --git a/addons/base/static/src/js/chrome.js b/addons/base/static/src/js/chrome.js
index 492e7c62b5d..34333abf1be 100644
--- a/addons/base/static/src/js/chrome.js
+++ b/addons/base/static/src/js/chrome.js
@@ -246,7 +246,7 @@ openerp.base.Session = openerp.base.Controller.extend( /** @lends openerp.base.S
      * @param port
      */
     init: function(parent, element_id, server, port) {
-        this._super(element_id);
+        this._super(parent, element_id);
         this.server = (server == undefined) ? location.hostname : server;
         this.port = (port == undefined) ? location.port : port;
         this.rpc_mode = (server == location.hostname) ? "ajax" : "jsonp";
-- 
cgit v1.2.3


From 5070784ba2b04d7ffb8935c9cf01dacfd7f03b26 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Tue, 26 Jul 2011 12:01:36 +0200
Subject: [FIX] correctly call on_close callback when clicking on a dialog's
 close button

bzr revid: xmo@openerp.com-20110726100136-1i858bxyipiboz0o
---
 addons/base/static/src/js/chrome.js | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'addons/base/static/src/js/chrome.js')

diff --git a/addons/base/static/src/js/chrome.js b/addons/base/static/src/js/chrome.js
index 34333abf1be..cc28aea4157 100644
--- a/addons/base/static/src/js/chrome.js
+++ b/addons/base/static/src/js/chrome.js
@@ -532,6 +532,7 @@ openerp.base.Dialog = openerp.base.BaseWidget.extend({
     dialog_title: "",
     identifier_prefix: 'dialog',
     init: function (parent, options) {
+        var self = this;
         this._super(parent);
         this.options = {
             modal: true,
@@ -542,7 +543,10 @@ openerp.base.Dialog = openerp.base.BaseWidget.extend({
             min_height: 0,
             max_height: '100%',
             autoOpen: false,
-            buttons: {}
+            buttons: {},
+            close: function () {
+                self.stop();
+            }
         };
         for (var f in this) {
             if (f.substr(0, 10) == 'on_button_') {
@@ -605,11 +609,7 @@ openerp.base.Dialog = openerp.base.BaseWidget.extend({
         this.set_options(options);
         this.$dialog.dialog(this.options).dialog('open');
     },
-    close: function(options) {
-        this.$dialog.dialog('close');
-    },
     stop: function () {
-        this.close();
         this.$dialog.dialog('destroy');
     }
 });
-- 
cgit v1.2.3