From 2075da0365c070f2e706e27c2df043ebd3a788e0 Mon Sep 17 00:00:00 2001
From: "Kunal Chavda (OpenERP)" <kch@tinyerp.com>
Date: Wed, 3 Aug 2011 18:31:46 +0530
Subject: [PATCH] [FIX]Renamed import module to data_import.

bzr revid: kch@tinyerp.com-20110803130146-ur8a91zoe6w7qjml
---
 addons/base/__openerp__.py                        |  2 +-
 addons/base/static/src/js/boot.js                 |  4 ++--
 .../static/src/js/{import.js => data_import.js}   | 11 +++--------
 addons/base/static/src/js/views.js                | 15 ++-------------
 4 files changed, 8 insertions(+), 24 deletions(-)
 rename addons/base/static/src/js/{import.js => data_import.js} (92%)

diff --git a/addons/base/__openerp__.py b/addons/base/__openerp__.py
index 28b92809b33..658ebe5c6ba 100644
--- a/addons/base/__openerp__.py
+++ b/addons/base/__openerp__.py
@@ -27,12 +27,12 @@
         "static/src/js/views.js",
         "static/src/js/data.js",
         "static/src/js/data_export.js",
+        "static/src/js/data_import.js",
         "static/src/js/form.js",
         "static/src/js/list.js",
         "static/src/js/list-editable.js",
         "static/src/js/search.js",
         "static/src/js/view_tree.js",
-        "static/src/js/import.js",
     ],
     'css' : [
         "static/lib/jquery.superfish/css/superfish.css",
diff --git a/addons/base/static/src/js/boot.js b/addons/base/static/src/js/boot.js
index dc0d514177b..a49ee13e2ba 100644
--- a/addons/base/static/src/js/boot.js
+++ b/addons/base/static/src/js/boot.js
@@ -89,8 +89,8 @@ openerp.base = function(instance) {
     if (openerp.base.data_export) {
         openerp.base.data_export(instance);
     }
-    if (openerp.base.import){
-        openerp.base.import(instance);
+    if (openerp.base.data_import){
+        openerp.base.data_import(instance);
     }
 };
 
diff --git a/addons/base/static/src/js/import.js b/addons/base/static/src/js/data_import.js
similarity index 92%
rename from addons/base/static/src/js/import.js
rename to addons/base/static/src/js/data_import.js
index a41fade9c03..0a31237c9b1 100644
--- a/addons/base/static/src/js/import.js
+++ b/addons/base/static/src/js/data_import.js
@@ -1,13 +1,8 @@
-openerp.base.import = function(openerp) {
-openerp.base.Import = openerp.base.Dialog.extend({
-    init: function(parent, dataset, views){
+openerp.base.data_import = function(openerp) {
+openerp.base.DataImport = openerp.base.Dialog.extend({
+    init: function(parent, dataset){
         this._super(parent);
         this.dataset = dataset;
-        this.views = views;
-        this.views_id = {};
-        for (var key in this.views) {
-            this.views_id[key] = this.views[key].view_id
-        }
     },
     start: function() {
         var self = this
diff --git a/addons/base/static/src/js/views.js b/addons/base/static/src/js/views.js
index e957505ae37..c0f98eb552c 100644
--- a/addons/base/static/src/js/views.js
+++ b/addons/base/static/src/js/views.js
@@ -216,19 +216,6 @@ openerp.base.ViewManager =  openerp.base.Widget.extend({
                 }
             }
         }
-        if(this.flags && this.flags.sidebar) {
-            if(this.$element.find('#importview')){
-                this.$element.find('#importview').remove()
-            }
-            if(this.active_view == 'list' || this.active_view == 'form') {
-                this.views[this.active_view].controller.$element.after(QWeb.render('ImportView'))
-                this.$element.find('#importview').click(function(ev) {
-                    var import_view = new openerp.base.Import(self, self.dataset, self.views);
-                    import_view.start(false);
-                    ev.preventDefault();
-                });
-            }
-        }
         return view_promise;
     },
     /**
@@ -575,6 +562,8 @@ openerp.base.View = openerp.base.Widget.extend({
         console.log('Todo');
     },
     on_sidebar_import: function() {
+        var import_view = new openerp.base.DataImport(this, this.dataset);
+        import_view.start(false);
     },
     on_sidebar_export: function() {
         var export_view = new openerp.base.DataExport(this, this.dataset);