[FIX]Renamed import module to data_import.

bzr revid: kch@tinyerp.com-20110803130146-ur8a91zoe6w7qjml

diff --git a/addons/base/__openerp__.py b/addons/base/__openerp__.py
index 28b9280..658ebe5 100644 (file)
--- 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 dc0d514..a49ee13 100644 (file)
--- 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/data_import.js b/addons/base/static/src/js/data_import.js
new file mode 100644 (file)
index 0000000..0a31237
--- /dev/null
+++ b/addons/base/static/src/js/data_import.js
@@ -0,0 +1,104 @@
+openerp.base.data_import = function(openerp) {
+openerp.base.DataImport = openerp.base.Dialog.extend({
+    init: function(parent, dataset){
+        this._super(parent);
+        this.dataset = dataset;
+    },
+    start: function() {
+        var self = this
+        self._super(false);
+        self.template = 'ImportDataView';
+        self.dialog_title = "Import Data"
+        self.open({
+                    modal: true,
+                    width: '70%',
+                    height: 'auto',
+                    position: 'top',
+                    buttons : {
+                        "Close" : function() {
+                            self.stop();
+                          },
+                        "Import File" : function() {
+                                //$("#import_data").submit();
+                                self.do_import();
+                          }
+                       },
+                    close: function(event, ui){ self.stop();}
+                   });
+        this.$element.find('#csvfile').change(this.on_autodetect_data);
+        this.$element.find('fieldset legend').click(function () {
+                $(this).next().toggle();
+        });
+    },
+    do_import: function() {
+            var self = this;
+            if(!this.$element.find('#csvfile').val()) { return; }
+            this.$element.find('#import_data').attr({
+                'action': '/base/import/import_data'
+            }).ajaxSubmit({
+                success: this.import_results
+            });
+    },
+    on_autodetect_data: function() {
+            var self = this;
+            if(this.$element.find("#res td")){
+                this.$element.find("#res td").remove();
+                this.$element.find("#imported_success").css('display','none');
+            }
+            if(!this.$element.find('#csvfile').val()) { return; }
+            this.$element.find('#import_data').attr({
+                'action': '/base/import/detect_data'
+            }).ajaxSubmit({
+                success: this.import_results
+            });
+    },
+    import_results:function(res){
+        var self = this;
+        var results = $.parseJSON(res);
+
+        if (results['records']){
+            var result = results['records'];
+            if ($('#error').find('table')){
+                $("#error table").remove();
+            }
+            if ($('#records_data').find('tr')){
+                $("#records_data tr").remove();
+            }
+            for (i in result) {
+                if (i == 0){
+                    $('#records_data').append('<tr class="grid-header"></tr>');
+                    for (m in result[i]){
+                        $('.grid-header').append('<th class="grid-cell">'+result[i][m]+'</th>');
+                    }
+                }else{
+                    $('#records_data tr:last').after('<tr id='+i+' class="grid-row"></tr>');
+                    for (n in result[i]){
+                        $("tr[id="+i+"]").append('<td class="grid-cell">'+result[i][n]+'</td>');
+                    }
+                }
+            }
+        }else if(results['error']){
+            var result = results['error'];
+            if ($('#records_data').find('tr')){
+                $("#records_data tr").remove();
+            }
+            if ($('#error').find('table')){
+                $("#error table").remove();
+            }
+            $("#error").append('<table id="error_tbl"><tr style="white-space: pre-line;">The import failed due to:'+result['message']+'</tr></table>');
+            if (result['preview']){
+                $("#error_tbl tr:last").after('<tr>Here is a preview of the file we could not import:</tr>');
+                $("#error_tbl tr:last").after('<tr><pre>'+result['preview']+'</pre></tr>');
+            }
+        }else if(results['success']){
+            var result = results['success'];
+            $("#imported_success").css('display','block');
+            $("#res").append('<td>'+result['message']+'</td>')
+        }
+    },
+    stop: function() {
+        $(this.$dialog).remove();
+        this._super();
+    },
+});
+}
\ No newline at end of file

diff --git a/addons/base/static/src/js/import.js b/addons/base/static/src/js/import.js
deleted file mode 100644 (file)
index a41fade..0000000
--- a/addons/base/static/src/js/import.js
+++ /dev/null
@@ -1,109 +0,0 @@
-openerp.base.import = function(openerp) {
-openerp.base.Import = openerp.base.Dialog.extend({
-    init: function(parent, dataset, views){
-        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
-        self._super(false);
-        self.template = 'ImportDataView';
-        self.dialog_title = "Import Data"
-        self.open({
-                    modal: true,
-                    width: '70%',
-                    height: 'auto',
-                    position: 'top',
-                    buttons : {
-                        "Close" : function() {
-                            self.stop();
-                          },
-                        "Import File" : function() {
-                                //$("#import_data").submit();
-                                self.do_import();
-                          }
-                       },
-                    close: function(event, ui){ self.stop();}
-                   });
-        this.$element.find('#csvfile').change(this.on_autodetect_data);
-        this.$element.find('fieldset legend').click(function () {
-                $(this).next().toggle();
-        });
-    },
-    do_import: function() {
-            var self = this;
-            if(!this.$element.find('#csvfile').val()) { return; }
-            this.$element.find('#import_data').attr({
-                'action': '/base/import/import_data'
-            }).ajaxSubmit({
-                success: this.import_results
-            });
-    },
-    on_autodetect_data: function() {
-            var self = this;
-            if(this.$element.find("#res td")){
-                this.$element.find("#res td").remove();
-                this.$element.find("#imported_success").css('display','none');
-            }
-            if(!this.$element.find('#csvfile').val()) { return; }
-            this.$element.find('#import_data').attr({
-                'action': '/base/import/detect_data'
-            }).ajaxSubmit({
-                success: this.import_results
-            });
-    },
-    import_results:function(res){
-        var self = this;
-        var results = $.parseJSON(res);
-
-        if (results['records']){
-            var result = results['records'];
-            if ($('#error').find('table')){
-                $("#error table").remove();
-            }
-            if ($('#records_data').find('tr')){
-                $("#records_data tr").remove();
-            }
-            for (i in result) {
-                if (i == 0){
-                    $('#records_data').append('<tr class="grid-header"></tr>');
-                    for (m in result[i]){
-                        $('.grid-header').append('<th class="grid-cell">'+result[i][m]+'</th>');
-                    }
-                }else{
-                    $('#records_data tr:last').after('<tr id='+i+' class="grid-row"></tr>');
-                    for (n in result[i]){
-                        $("tr[id="+i+"]").append('<td class="grid-cell">'+result[i][n]+'</td>');
-                    }
-                }
-            }
-        }else if(results['error']){
-            var result = results['error'];
-            if ($('#records_data').find('tr')){
-                $("#records_data tr").remove();
-            }
-            if ($('#error').find('table')){
-                $("#error table").remove();
-            }
-            $("#error").append('<table id="error_tbl"><tr style="white-space: pre-line;">The import failed due to:'+result['message']+'</tr></table>');
-            if (result['preview']){
-                $("#error_tbl tr:last").after('<tr>Here is a preview of the file we could not import:</tr>');
-                $("#error_tbl tr:last").after('<tr><pre>'+result['preview']+'</pre></tr>');
-            }
-        }else if(results['success']){
-            var result = results['success'];
-            $("#imported_success").css('display','block');
-            $("#res").append('<td>'+result['message']+'</td>')
-        }
-    },
-    stop: function() {
-        $(this.$dialog).remove();
-        this._super();
-    },
-});
-}
\ No newline at end of file

diff --git a/addons/base/static/src/js/views.js b/addons/base/static/src/js/views.js
index e957505..c0f98eb 100644 (file)
--- 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);