From 0d061d6c77b30e137d7650d63155297e5695979c Mon Sep 17 00:00:00 2001
From: niv-openerp <nicolas.vanhoren@openerp.com>
Date: Fri, 17 Feb 2012 12:43:57 +0100
Subject: [fix] added openerp class to all dialogs

bzr revid: nicolas.vanhoren@openerp.com-20120217114357-5jeue9292eg2zoqf
---
 addons/web/static/src/js/data_import.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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

diff --git a/addons/web/static/src/js/data_import.js b/addons/web/static/src/js/data_import.js
index 83eea2cccbb..e88ba765200 100644
--- a/addons/web/static/src/js/data_import.js
+++ b/addons/web/static/src/js/data_import.js
@@ -151,7 +151,7 @@ openerp.web.DataImport = openerp.web.Dialog.extend({
         });
     },
     toggle_import_button: function (newstate) {
-        this.$element.dialog('widget')
+    	openerp.web.dialog(this.$element, 'widget')
                 .find('.oe-dialog-import-button')
                 .button('option', 'disabled', !newstate);
     },
-- 
cgit v1.2.3


From 8384876ef08ae3e8af97a9531da7f79a8359d607 Mon Sep 17 00:00:00 2001
From: niv-openerp <nicolas.vanhoren@openerp.com>
Date: Tue, 21 Feb 2012 16:30:23 +0100
Subject: [imp] renamed widget_parent to getParent()

bzr revid: nicolas.vanhoren@openerp.com-20120221153023-cqs66neaddtuf7km
---
 addons/web/static/src/js/data_import.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

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

diff --git a/addons/web/static/src/js/data_import.js b/addons/web/static/src/js/data_import.js
index e88ba765200..e50f5a7b3db 100644
--- a/addons/web/static/src/js/data_import.js
+++ b/addons/web/static/src/js/data_import.js
@@ -201,8 +201,8 @@ openerp.web.DataImport = openerp.web.Dialog.extend({
             return;
         }
         if (results['success']) {
-            if (this.widget_parent.widget_parent.active_view == "list") {
-                this.widget_parent.reload_content();
+            if (this.getParent().getParent().active_view == "list") {
+                this.getParent().reload_content();
             }
             this.stop();
             return;
-- 
cgit v1.2.3


From 75d39c7f6a2565419c28bac4397678a6d60c5544 Mon Sep 17 00:00:00 2001
From: niv-openerp <nicolas.vanhoren@openerp.com>
Date: Tue, 21 Feb 2012 17:29:12 +0100
Subject: [imp] renammed stop()

bzr revid: nicolas.vanhoren@openerp.com-20120221162912-zheko30qoh84hcoq
---
 addons/web/static/src/js/data_import.js | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

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

diff --git a/addons/web/static/src/js/data_import.js b/addons/web/static/src/js/data_import.js
index e50f5a7b3db..3054a7784c4 100644
--- a/addons/web/static/src/js/data_import.js
+++ b/addons/web/static/src/js/data_import.js
@@ -66,11 +66,11 @@ openerp.web.DataImport = openerp.web.Dialog.extend({
         this._super();
         this.open({
             buttons: [
-                {text: _t("Close"), click: function() { self.stop(); }},
+                {text: _t("Close"), click: function() { self.destroy(); }},
                 {text: _t("Import File"), click: function() { self.do_import(); }, 'class': 'oe-dialog-import-button'}
             ],
             close: function(event, ui) {
-                self.stop();
+                self.destroy();
             }
         });
         this.toggle_import_button(false);
@@ -204,7 +204,7 @@ openerp.web.DataImport = openerp.web.Dialog.extend({
             if (this.getParent().getParent().active_view == "list") {
                 this.getParent().reload_content();
             }
-            this.stop();
+            this.destroy();
             return;
         }
 
@@ -358,7 +358,7 @@ openerp.web.DataImport = openerp.web.Dialog.extend({
         }
         return true;
     },
-    stop: function() {
+    destroy: function() {
         this.$element.remove();
         this._super();
     }
-- 
cgit v1.2.3