From f6f37632ceb0ed2a6abd043c884e5e9de1cb8d51 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Wed, 26 Sep 2012 15:50:13 +0200
Subject: [IMP] errors display, dryrun management (add button)

bzr revid: xmo@openerp.com-20120926135013-rkbvxluu6tqz9a1l
---
 addons/base_import/static/src/js/import.js | 21 +++++++++++----------
 1 file changed, 11 insertions(+), 10 deletions(-)

(limited to 'addons/base_import/static/src')

diff --git a/addons/base_import/static/src/js/import.js b/addons/base_import/static/src/js/import.js
index c2deb660ff2..9cb2f74bd48 100644
--- a/addons/base_import/static/src/js/import.js
+++ b/addons/base_import/static/src/js/import.js
@@ -63,7 +63,7 @@ openerp.base_import = function (instance) {
             {name: 'quoting', label: _lt("Quoting:"), value: '"'}
         ],
         events: {
-            'change .oe_import_grid input': 'import_dryrun',
+            // 'change .oe_import_grid input': 'import_dryrun',
             'change input.oe_import_file': 'file_update',
             'change input.oe_import_has_header, .oe_import_options input': 'settings_updated',
             'click a.oe_import_csv': function (e) {
@@ -85,9 +85,10 @@ openerp.base_import = function (instance) {
             var self = this;
             this._super(parent, {
                 buttons: [
-                    {text: _t("Import File"), click: function () {
-                        self.do_import();
-                    }, 'class': 'oe_import_dialog_button'}
+                    {text: _t("Import"), click: self.proxy('do_import'),
+                     'class': 'oe_import_dialog_button'},
+                    {text: _t("Validate"), click: self.proxy('import_dryrun'),
+                     'class': 'oe_import_dialog_button'}
                 ]
             });
             this.res_model = parent.model;
@@ -134,11 +135,12 @@ openerp.base_import = function (instance) {
                 .then(this.proxy('preview'));
         },
         preview: function (result) {
+            this.$el.removeClass('oe_import_preview_error oe_import_error');
             this.$el.toggleClass(
                 'oe_import_noheaders',
                 !this.$('input.oe_import_has_header').prop('checked'));
             if (result.error) {
-                this.$el.addClass('oe_import_error');
+                this.$el.addClass('oe_import_preview_error oe_import_error');
                 this.$('.oe_import_error_report').html(
                     QWeb.render('ImportView.preview.error', result));
                 return;
@@ -180,7 +182,7 @@ openerp.base_import = function (instance) {
                 width: 'resolve',
                 dropdownCssClass: 'oe_import_selector'
             });
-            this.import_dryrun();
+            //this.import_dryrun();
         },
         generate_fields_completion: function (root) {
             var basic = [];
@@ -252,7 +254,6 @@ openerp.base_import = function (instance) {
 
         //- import itself
         call_import: function (options) {
-            var self = this;
             var fields = this.$('.oe_import_fields input.oe_import_match_field').map(function (index, el) {
                 return $(el).select2('val') || false;
             }).get();
@@ -260,12 +261,12 @@ openerp.base_import = function (instance) {
                 'do', [this.id, fields, this.import_options()], options);
         },
         import_dryrun: function () {
-//            this.call_import({ dryrun: true })
-//                .then(this.proxy('render_import_errors'));
+            return this.call_import({ dryrun: true })
+                .then(this.proxy('render_import_errors'));
         },
         do_import: function () {
             var self = this;
-            this.call_import({ dryrun: false }).then(function (errors) {
+            return this.call_import({ dryrun: false }).then(function (errors) {
                 if (_.isEmpty(errors)) {
                     if (self.getParent().reload_content) {
                         self.getParent().reload_content();
-- 
cgit v1.2.3


From 27aeae974aa4a001e7c8f13cd01f98a5ca295334 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Wed, 26 Sep 2012 18:50:52 +0200
Subject: [IMP] warning and error reporting during import

bzr revid: xmo@openerp.com-20120926165052-7eq4ne62h63zbqqm
---
 addons/base_import/static/src/css/import.css |  6 ++--
 addons/base_import/static/src/js/import.js   | 41 ++++++++++++++++++++++------
 addons/base_import/static/src/xml/import.xml | 26 +++++++++++++++---
 3 files changed, 58 insertions(+), 15 deletions(-)

(limited to 'addons/base_import/static/src')

diff --git a/addons/base_import/static/src/css/import.css b/addons/base_import/static/src/css/import.css
index f6258f5aa50..da61473fdba 100644
--- a/addons/base_import/static/src/css/import.css
+++ b/addons/base_import/static/src/css/import.css
@@ -10,7 +10,8 @@
 .oe_import .oe_import_grid,
 .oe_import .oe_import_error_report,
 .oe_import .oe_import_with_file,
-.oe_import .oe_import_noheaders {
+.oe_import .oe_import_noheaders,
+.oe_import .oe_import_report_more {
     display: none;
 }
 
@@ -19,7 +20,8 @@
 }
 .oe_import.oe_import_error .oe_import_error_report,
 .oe_import.oe_import_with_file .oe_import_with_file,
-.oe_import.oe_import_noheaders .oe_import_noheaders {
+.oe_import.oe_import_noheaders .oe_import_noheaders,
+.oe_import .oe_import_report_showmore .oe_import_report_more {
     display: block;
 }
 
diff --git a/addons/base_import/static/src/js/import.js b/addons/base_import/static/src/js/import.js
index 9cb2f74bd48..d5f059d0656 100644
--- a/addons/base_import/static/src/js/import.js
+++ b/addons/base_import/static/src/js/import.js
@@ -79,6 +79,10 @@ openerp.base_import = function (instance) {
                         ? $el.next()
                         : $el.parent().next())
                     .toggle();
+            },
+            'click .oe_import_report a.oe_import_report_count': function (e) {
+                e.preventDefault();
+                $(e.target).parent().toggleClass('oe_import_report_showmore');
             }
         },
         init: function (parent, dataset) {
@@ -262,31 +266,50 @@ openerp.base_import = function (instance) {
         },
         import_dryrun: function () {
             return this.call_import({ dryrun: true })
-                .then(this.proxy('render_import_errors'));
+                .then(this.proxy('render_import_result'));
         },
         do_import: function () {
             var self = this;
-            return this.call_import({ dryrun: false }).then(function (errors) {
-                if (_.isEmpty(errors)) {
+            return this.call_import({ dryrun: false }).then(function (message) {
+                if (!_.any(message, function (message) {
+                        return message.type === 'error' })) {
                     if (self.getParent().reload_content) {
                         self.getParent().reload_content();
                     }
                     self.close();
                     return;
                 }
-                self.render_import_errors(errors);
+                self.render_import_result(message);
             });
         },
-        render_import_errors: function (errors) {
-            if (_.isEmpty(errors)) {
+        render_import_result: function (message) {
+            if (_.isEmpty(message)) {
                 this.$el.removeClass('oe_import_error');
                 return;
             }
-            // import failed (or maybe just warnings, if we ever get
-            // warnings?)
+            // row indexes come back 0-indexed, spreadsheets
+            // display 1-indexed.
+            var offset = 1;
+            // offset more if header
+            if (this.import_options().header) { offset += 1; }
+
             this.$el.addClass('oe_import_error');
             this.$('.oe_import_error_report').html(
-                QWeb.render('ImportView.error', {errors: errors}));
+                QWeb.render('ImportView.error', {
+                    errors: _(message).groupBy('message'),
+                    at: function (rows) {
+                        var from = rows.from + offset;
+                        var to = rows.to + offset;
+                        if (from === to) {
+                            return _.str.sprintf(_t("at row %d"), from);
+                        }
+                        return _.str.sprintf(_t("between rows %d and %d"),
+                                             from, to);
+                    },
+                    more: function (n) {
+                        return _.str.sprintf(_t("(%d times more)"), n);
+                    },
+                }));
         },
     });
 };
diff --git a/addons/base_import/static/src/xml/import.xml b/addons/base_import/static/src/xml/import.xml
index 386348bea4b..5d36eae4d2d 100644
--- a/addons/base_import/static/src/xml/import.xml
+++ b/addons/base_import/static/src/xml/import.xml
@@ -86,12 +86,30 @@
         <pre><t t-esc="preview"/></pre>
     </t>
     <ul t-name="ImportView.error">
-        <li t-foreach="errors" t-as="error" t-attf-class="oe_import_report_#{error.type}">
-            <!-- can also have error.record, but may be *huge* if
-                 e.g. has image fields -->
-            <t t-esc="error.message"/>
+        <li t-foreach="errors" t-as="error"
+            t-attf-class="oe_import_report oe_import_report_#{error_value[0].type}">
+            <t t-call="ImportView.error.each">
+                <t t-set="error" t-value="error_value[0]"/>
+            </t>
+
+            <a href="#" class="oe_import_report_count" t-if="error_value.length gt 1">
+                <t t-esc="more(error_value.length - 1)"/>
+            </a>
+            <ul class="oe_import_report_more" t-if="error_value.length gt 1">
+                <li t-foreach="error_value.length - 1" t-as="index">
+                    <t t-call="ImportView.error.each">
+                        <t t-set="error" t-value="error_value[index + 1]"/>
+                    </t>
+                </li>
+            </ul>
         </li>
     </ul>
+    <t t-name="ImportView.error.each">
+        <span class="oe_import_report_message">
+            <t t-esc="error.message"/>
+        </span>
+        <t t-if="error.rows"><t t-esc="at(error.rows)"/></t>
+    </t>
     <t t-extend="ListView.buttons">
         <t t-jquery="span.oe_alternative">
             this.attr('t-if', 'widget.options.import_enabled');
-- 
cgit v1.2.3


From 4d7576393a3e0efadf639dbe9958725f76ae6f10 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Thu, 27 Sep 2012 09:48:45 +0200
Subject: [ADD] unstyled and incomplete handling of @moreinfo

action triggering is still missing

bzr revid: xmo@openerp.com-20120927074845-pb3osgymmtddglc0
---
 addons/base_import/static/src/js/import.js   | 35 +++++++++++++++++++++++++++-
 addons/base_import/static/src/xml/import.xml |  3 ++-
 2 files changed, 36 insertions(+), 2 deletions(-)

(limited to 'addons/base_import/static/src')

diff --git a/addons/base_import/static/src/js/import.js b/addons/base_import/static/src/js/import.js
index d5f059d0656..ac81f89c7a9 100644
--- a/addons/base_import/static/src/js/import.js
+++ b/addons/base_import/static/src/js/import.js
@@ -83,6 +83,12 @@ openerp.base_import = function (instance) {
             'click .oe_import_report a.oe_import_report_count': function (e) {
                 e.preventDefault();
                 $(e.target).parent().toggleClass('oe_import_report_showmore');
+            },
+            'click .oe_import_moreinfo_action a': function (e) {
+                e.preventDefault();
+                // #data will parse the attribute on its own, we don't like that
+                var action = JSON.parse($(e.target).attr('data-action'));
+                console.log(action);
             }
         },
         init: function (parent, dataset) {
@@ -307,7 +313,34 @@ openerp.base_import = function (instance) {
                                              from, to);
                     },
                     more: function (n) {
-                        return _.str.sprintf(_t("(%d times more)"), n);
+                        return _.str.sprintf(_t("(%d more)"), n);
+                    },
+                    info: function (msg) {
+                        if (typeof msg === 'string') {
+                            return _.str.sprintf(
+                                '<div class="oe_import_moreinfo oe_import_moreinfo_message">%s</div>',
+                                _.str.escapeHTML(msg));
+                        }
+                        if (msg instanceof Array) {
+                            return _.str.sprintf(
+                                '<div class="oe_import_moreinfo oe_import_moreinfo_choices">%s <ul>%s</ul></div>',
+                                _.str.escapeHTML(_t("Here are the possible values:")),
+                                _(msg).map(function (msg) {
+                                    return '<li>'
+                                        + _.str.escapeHTML(msg)
+                                    + '</li>';
+                                }).join());
+                        }
+                        // Final should be object, action descriptor
+                        return [
+                            '<div class="oe_import_moreinfo oe_import_moreinfo_action">',
+                                _.str.sprintf('<a href="#" data-action="%s">',
+                                        _.str.escapeHTML(JSON.stringify(msg))),
+                                    _.str.escapeHTML(
+                                        _t("Get all possible values")),
+                                '</a>',
+                            '</div>'
+                        ].join('')
                     },
                 }));
         },
diff --git a/addons/base_import/static/src/xml/import.xml b/addons/base_import/static/src/xml/import.xml
index 5d36eae4d2d..2efd0b5a752 100644
--- a/addons/base_import/static/src/xml/import.xml
+++ b/addons/base_import/static/src/xml/import.xml
@@ -108,7 +108,8 @@
         <span class="oe_import_report_message">
             <t t-esc="error.message"/>
         </span>
-        <t t-if="error.rows"><t t-esc="at(error.rows)"/></t>
+        <t t-if="error.rows"  t-esc="at(error.rows)"/>
+        <t t-if="error.moreinfo" t-raw="info(error.moreinfo)"/>
     </t>
     <t t-extend="ListView.buttons">
         <t t-jquery="span.oe_alternative">
-- 
cgit v1.2.3


From 4787939773e175475c03d70c4e32fdf0eeea1097 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Thu, 27 Sep 2012 11:49:50 +0200
Subject: [FIX] correctly transform 'get all possible values' action links to
 display list views as list views

bzr revid: xmo@openerp.com-20120927094950-pwlgv2kt2a0jz8ji
---
 addons/base_import/static/src/js/import.js | 17 ++++++++++++++---
 1 file changed, 14 insertions(+), 3 deletions(-)

(limited to 'addons/base_import/static/src')

diff --git a/addons/base_import/static/src/js/import.js b/addons/base_import/static/src/js/import.js
index ac81f89c7a9..8a73bcd5d71 100644
--- a/addons/base_import/static/src/js/import.js
+++ b/addons/base_import/static/src/js/import.js
@@ -86,9 +86,20 @@ openerp.base_import = function (instance) {
             },
             'click .oe_import_moreinfo_action a': function (e) {
                 e.preventDefault();
-                // #data will parse the attribute on its own, we don't like that
+                // #data will parse the attribute on its own, we don't like
+                // that sort of things
                 var action = JSON.parse($(e.target).attr('data-action'));
-                console.log(action);
+                // FIXME: when JS-side clean_action
+                action.views = _(action.views).map(function (view) {
+                    var id = view[0], type = view[1];
+                    return [
+                        id,
+                        type !== 'tree' ? type
+                          : action.view_type === 'form' ? 'list'
+                          : 'tree'
+                    ];
+                });
+                this.do_action(_.extend(action, {target: 'new'}));
             }
         },
         init: function (parent, dataset) {
@@ -329,7 +340,7 @@ openerp.base_import = function (instance) {
                                     return '<li>'
                                         + _.str.escapeHTML(msg)
                                     + '</li>';
-                                }).join());
+                                }).join(''));
                         }
                         // Final should be object, action descriptor
                         return [
-- 
cgit v1.2.3


From abf0579a9825a1a72a7525b26c80c87838fd6058 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Mon, 1 Oct 2012 12:52:35 +0200
Subject: [IMP] Invert order of buttons in import dialog, add 'or cancel' link

bzr revid: xmo@openerp.com-20121001105235-0d954cxt9y80q89w
---
 addons/base_import/static/src/js/import.js | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

(limited to 'addons/base_import/static/src')

diff --git a/addons/base_import/static/src/js/import.js b/addons/base_import/static/src/js/import.js
index 8a73bcd5d71..2a7e6f18d8a 100644
--- a/addons/base_import/static/src/js/import.js
+++ b/addons/base_import/static/src/js/import.js
@@ -106,10 +106,10 @@ openerp.base_import = function (instance) {
             var self = this;
             this._super(parent, {
                 buttons: [
-                    {text: _t("Import"), click: self.proxy('do_import'),
-                     'class': 'oe_import_dialog_button'},
                     {text: _t("Validate"), click: self.proxy('import_dryrun'),
-                     'class': 'oe_import_dialog_button'}
+                     'class': 'oe_import_dialog_button'},
+                    {text: _t("Import"), click: self.proxy('do_import'),
+                     'class': 'oe_import_dialog_button oe_highlight'}
                 ]
             });
             this.res_model = parent.model;
@@ -126,6 +126,16 @@ openerp.base_import = function (instance) {
                 self.$('input[name=import_id]').val(id);
             });
         },
+        open: function () {
+            this._super.apply(this, arguments);
+            this.$el.dialog('widget').find('.ui-dialog-buttonset')
+                .append(_t(" or "))
+                .append(
+                    $('<button type="button" class="oe_link oe_button">')
+                        .click(this.proxy('close'))
+                        .append($('<span>').text(_t("Cancel"))));
+            return this;
+        },
 
         import_options: function () {
             var self = this;
-- 
cgit v1.2.3


From da8ab1cc13f900d03514f74768ab9ee0979f3295 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Mon, 1 Oct 2012 13:03:03 +0200
Subject: [FIX] link [CSV] to wikipedia

bzr revid: xmo@openerp.com-20121001110303-xkjjuhuxcb378cyx
---
 addons/base_import/static/src/xml/import.xml | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

(limited to 'addons/base_import/static/src')

diff --git a/addons/base_import/static/src/xml/import.xml b/addons/base_import/static/src/xml/import.xml
index 2efd0b5a752..77c3d7d6ce5 100644
--- a/addons/base_import/static/src/xml/import.xml
+++ b/addons/base_import/static/src/xml/import.xml
@@ -6,10 +6,11 @@
                    t-att-value="widget.session.session_id"/>
             <input type="hidden" name="import_id"/>
             <h2>Upload your file</h2>
-            <p>Select the <a href="#" class="oe_import_csv">.CSV</a>
+            <p>Select the <a
+                    href="http://en.wikipedia.org/wiki/Comma-separated_values"
+                    class="oe_import_csv">.CSV</a>
             file to import. If you need a sample importable file, you
-            can use <a href="#" class="oe_import_export">the export
-            tool</a> to generate one.</p>
+            can use the export tool to generate one.</p>
             <label t-attf-for="file_#{_id}" autofocus="autofocus">CSV File:</label>
             <input type="file" id-attf-id="file_#{_id}"
                    name="file" class="oe_import_file"/>
-- 
cgit v1.2.3


From a7a8104623fa868e65265b54c826c0dd828c1663 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Mon, 1 Oct 2012 15:52:17 +0200
Subject: [IMP] base_import: typo in field name for row number offset

bzr revid: xmo@openerp.com-20121001135217-0ao29ldft17d52ur
---
 addons/base_import/static/src/js/import.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'addons/base_import/static/src')

diff --git a/addons/base_import/static/src/js/import.js b/addons/base_import/static/src/js/import.js
index 2a7e6f18d8a..80f72a14f5b 100644
--- a/addons/base_import/static/src/js/import.js
+++ b/addons/base_import/static/src/js/import.js
@@ -318,7 +318,7 @@ openerp.base_import = function (instance) {
             // display 1-indexed.
             var offset = 1;
             // offset more if header
-            if (this.import_options().header) { offset += 1; }
+            if (this.import_options().headers) { offset += 1; }
 
             this.$el.addClass('oe_import_error');
             this.$('.oe_import_error_report').html(
-- 
cgit v1.2.3


From 89be614ea3159be3879fbd4e0dd477a8d94e596c Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Mon, 1 Oct 2012 16:06:22 +0200
Subject: [ADD] base_import: info message when everything looks ok after a
 validation

bzr revid: xmo@openerp.com-20121001140622-v63opfo97mmxf3sr
---
 addons/base_import/static/src/css/import.css | 3 +++
 addons/base_import/static/src/js/import.js   | 6 ++++--
 2 files changed, 7 insertions(+), 2 deletions(-)

(limited to 'addons/base_import/static/src')

diff --git a/addons/base_import/static/src/css/import.css b/addons/base_import/static/src/css/import.css
index da61473fdba..25678cbe98a 100644
--- a/addons/base_import/static/src/css/import.css
+++ b/addons/base_import/static/src/css/import.css
@@ -31,6 +31,9 @@
 .oe_import .oe_import_error_report ul .oe_import_report_warning {
     background-color: #FEFFD9;
 }
+.oe_import .oe_import_error_report ul .oe_import_report_info {
+    background-color: #d3ffd3;
+}
 
 .oe_import .oe_import_noheaders {
     color: #888;
diff --git a/addons/base_import/static/src/js/import.js b/addons/base_import/static/src/js/import.js
index 80f72a14f5b..90995027021 100644
--- a/addons/base_import/static/src/js/import.js
+++ b/addons/base_import/static/src/js/import.js
@@ -311,8 +311,10 @@ openerp.base_import = function (instance) {
         },
         render_import_result: function (message) {
             if (_.isEmpty(message)) {
-                this.$el.removeClass('oe_import_error');
-                return;
+                message.push({
+                    type: 'info',
+                    message: _t("Everything seems valid.")
+                });
             }
             // row indexes come back 0-indexed, spreadsheets
             // display 1-indexed.
-- 
cgit v1.2.3


From 771fae90d7f1435eebe682a7dbfa49ac764de436 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Mon, 1 Oct 2012 16:22:27 +0200
Subject: [IMP] base_import: better warnings when the file parsing has very
 likely failed

bzr revid: xmo@openerp.com-20121001142227-v1iypgjgfcq4pgo7
---
 addons/base_import/static/src/js/import.js   | 14 ++++++++++++--
 addons/base_import/static/src/xml/import.xml |  3 ++-
 2 files changed, 14 insertions(+), 3 deletions(-)

(limited to 'addons/base_import/static/src')

diff --git a/addons/base_import/static/src/js/import.js b/addons/base_import/static/src/js/import.js
index 90995027021..0ea74e43755 100644
--- a/addons/base_import/static/src/js/import.js
+++ b/addons/base_import/static/src/js/import.js
@@ -171,14 +171,24 @@ openerp.base_import = function (instance) {
                 'oe_import_noheaders',
                 !this.$('input.oe_import_has_header').prop('checked'));
             if (result.error) {
+                this.$('.oe_import_options').show();
                 this.$el.addClass('oe_import_preview_error oe_import_error');
                 this.$('.oe_import_error_report').html(
-                    QWeb.render('ImportView.preview.error', result));
+                        QWeb.render('ImportView.preview.error', result))
+                    .get(0).scrollIntoView();
                 return;
             }
             this.$el.addClass('oe_import_preview');
             this.$('table').html(QWeb.render('ImportView.preview', result));
 
+            if (result.headers.length === 1) {
+                this.$('.oe_import_options').show();
+                this.render_import_result([{
+                    type: 'warning',
+                    message: _t("A single column was found in the file, this often means the file separator is incorrect")
+                }]);
+            }
+
             var $fields = this.$('.oe_import_fields input');
             this.render_fields_matches(result, $fields);
             var data = this.generate_fields_completion(result);
@@ -365,7 +375,7 @@ openerp.base_import = function (instance) {
                             '</div>'
                         ].join('')
                     },
-                }));
+                })).get(0).scrollIntoView();
         },
     });
 };
diff --git a/addons/base_import/static/src/xml/import.xml b/addons/base_import/static/src/xml/import.xml
index 77c3d7d6ce5..e11cce26b80 100644
--- a/addons/base_import/static/src/xml/import.xml
+++ b/addons/base_import/static/src/xml/import.xml
@@ -82,7 +82,8 @@
         </tr>
     </t>
     <t t-name="ImportView.preview.error">
-        <p>Import preview failed due to: <t t-esc="error"/></p>
+        <p>Import preview failed due to: <t t-esc="error"/>. The issue is
+            usually an incorrect file encoding.</p>
         <p>Here is the start of the file we could not import:</p>
         <pre><t t-esc="preview"/></pre>
     </t>
-- 
cgit v1.2.3


From f6544c801fa070403ce122d47c90644b50d8db58 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Wed, 3 Oct 2012 14:11:37 +0200
Subject: [IMP] make import into a full-scene client action

* Correctly handle back (via history_back)
* Disable buttons when no file has been loaded yet
* Highlight import when a validation has yield no message

bzr revid: xmo@openerp.com-20121003121137-xo7lu5m5y0s7gyo1
---
 addons/base_import/static/src/js/import.js   | 74 +++++++++++++++-------------
 addons/base_import/static/src/xml/import.xml | 10 ++++
 2 files changed, 50 insertions(+), 34 deletions(-)

(limited to 'addons/base_import/static/src')

diff --git a/addons/base_import/static/src/js/import.js b/addons/base_import/static/src/js/import.js
index 0ea74e43755..dd8b3288de9 100644
--- a/addons/base_import/static/src/js/import.js
+++ b/addons/base_import/static/src/js/import.js
@@ -47,16 +47,23 @@ openerp.base_import = function (instance) {
             this._super.apply(this, arguments);
             if(add_button) {
                 this.$buttons.on('click', '.oe_list_button_import', function() {
-                    new instance.web.DataImport(self, self.dataset).open();
+                    self.do_action({
+                        type: 'ir.actions.client',
+                        tag: 'import',
+                        params: {
+                            model: self.dataset.model
+                        }
+                    });
                     return false;
                 });
             }
         }
     });
 
-    instance.web.DataImport = instance.web.Dialog.extend({
+    instance.web.client_actions.add(
+        'import', 'instance.web.DataImport');
+    instance.web.DataImport = instance.web.Widget.extend({
         template: 'ImportView',
-        dialog_title: _lt("Import Data"),
         opts: [
             {name: 'encoding', label: _lt("Encoding:"), value: 'utf-8'},
             {name: 'separator', label: _lt("Separator:"), value: ','},
@@ -100,41 +107,34 @@ openerp.base_import = function (instance) {
                     ];
                 });
                 this.do_action(_.extend(action, {target: 'new'}));
+            },
+            // buttons
+            'click .oe_import_validate': 'import_dryrun',
+            'click .oe_import_import': 'do_import',
+            'click .oe_import_cancel': function (e) {
+                e.preventDefault();
+                this.exit();
             }
         },
-        init: function (parent, dataset) {
-            var self = this;
-            this._super(parent, {
-                buttons: [
-                    {text: _t("Validate"), click: self.proxy('import_dryrun'),
-                     'class': 'oe_import_dialog_button'},
-                    {text: _t("Import"), click: self.proxy('do_import'),
-                     'class': 'oe_import_dialog_button oe_highlight'}
-                ]
-            });
-            this.res_model = parent.model;
+        init: function (parent, params) {
+            this._super.apply(this, arguments);
+            this.res_model = params.model;
             // import object id
             this.id = null;
             this.Import = new instance.web.Model('base_import.import');
         },
         start: function () {
             var self = this;
-            return this.Import.call('create', [{
-                'res_model': this.res_model
-            }]).then(function (id) {
-                self.id = id;
-                self.$('input[name=import_id]').val(id);
-            });
-        },
-        open: function () {
-            this._super.apply(this, arguments);
-            this.$el.dialog('widget').find('.ui-dialog-buttonset')
-                .append(_t(" or "))
-                .append(
-                    $('<button type="button" class="oe_link oe_button">')
-                        .click(this.proxy('close'))
-                        .append($('<span>').text(_t("Cancel"))));
-            return this;
+
+            return $.when(
+                this._super(),
+                this.Import.call('create', [{
+                    'res_model': this.res_model
+                }]).then(function (id) {
+                    self.id = id;
+                    self.$('input[name=import_id]').val(id);
+                })
+            )
         },
 
         import_options: function () {
@@ -151,6 +151,7 @@ openerp.base_import = function (instance) {
 
         //- File & settings change section
         file_update: function (e) {
+            this.$('.oe_import_button').prop('disabled', true);
             if (!this.$('input.oe_import_file').val()) { return; }
 
             this.$el.removeClass('oe_import_preview oe_import_error');
@@ -178,6 +179,7 @@ openerp.base_import = function (instance) {
                     .get(0).scrollIntoView();
                 return;
             }
+            this.$('.oe_import_button').prop('disabled', false);
             this.$el.addClass('oe_import_preview');
             this.$('table').html(QWeb.render('ImportView.preview', result));
 
@@ -310,17 +312,21 @@ openerp.base_import = function (instance) {
             return this.call_import({ dryrun: false }).then(function (message) {
                 if (!_.any(message, function (message) {
                         return message.type === 'error' })) {
-                    if (self.getParent().reload_content) {
-                        self.getParent().reload_content();
-                    }
-                    self.close();
+                    self.exit();
                     return;
                 }
                 self.render_import_result(message);
             });
         },
+        exit: function () {
+            this.do_action({
+                type: 'ir.actions.client',
+                tag: 'history_back'
+            });
+        },
         render_import_result: function (message) {
             if (_.isEmpty(message)) {
+                this.$('.oe_import_import').addClass('oe_highlight');
                 message.push({
                     type: 'info',
                     message: _t("Everything seems valid.")
diff --git a/addons/base_import/static/src/xml/import.xml b/addons/base_import/static/src/xml/import.xml
index e11cce26b80..aab9482ee81 100644
--- a/addons/base_import/static/src/xml/import.xml
+++ b/addons/base_import/static/src/xml/import.xml
@@ -2,6 +2,16 @@
     <t t-name="ImportView">
         <t t-set="_id" t-value="_.uniqueId('export')"/>
         <form action="" method="post" enctype="multipart/form-data" class="oe_import">
+            <header>
+                <button type="button" disabled="disabled"
+                        class="oe_button oe_import_button oe_import_validate"
+                    >Validate</button>
+                <button type="button" disabled="disabled"
+                        class="oe_button oe_import_button oe_import_import"
+                    >Import</button>
+                <span class="oe_fade">or</span>
+                <a class="oe_import_cancel" href="#">Cancel</a>
+            </header>
             <input type="hidden" name="session_id"
                    t-att-value="widget.session.session_id"/>
             <input type="hidden" name="import_id"/>
-- 
cgit v1.2.3


From e8a7d276bf700b3c880d4e961cfac1ea0b40c690 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Wed, 3 Oct 2012 14:16:19 +0200
Subject: [IMP] highlight toggling between validation and import buttons

bzr revid: xmo@openerp.com-20121003121619-e6nbd78mfa5owycp
---
 addons/base_import/static/src/js/import.js   | 6 ++++--
 addons/base_import/static/src/xml/import.xml | 2 +-
 2 files changed, 5 insertions(+), 3 deletions(-)

(limited to 'addons/base_import/static/src')

diff --git a/addons/base_import/static/src/js/import.js b/addons/base_import/static/src/js/import.js
index dd8b3288de9..4135f303513 100644
--- a/addons/base_import/static/src/js/import.js
+++ b/addons/base_import/static/src/js/import.js
@@ -325,8 +325,10 @@ openerp.base_import = function (instance) {
             });
         },
         render_import_result: function (message) {
-            if (_.isEmpty(message)) {
-                this.$('.oe_import_import').addClass('oe_highlight');
+            var no_messages = _.isEmpty(message);
+            this.$('.oe_import_import').toggleClass('oe_highlight', no_messages);
+            this.$('.oe_import_validate').toggleClass('oe_highlight', !no_messages);
+            if (no_messages) {
                 message.push({
                     type: 'info',
                     message: _t("Everything seems valid.")
diff --git a/addons/base_import/static/src/xml/import.xml b/addons/base_import/static/src/xml/import.xml
index aab9482ee81..b0eea1fcf75 100644
--- a/addons/base_import/static/src/xml/import.xml
+++ b/addons/base_import/static/src/xml/import.xml
@@ -4,7 +4,7 @@
         <form action="" method="post" enctype="multipart/form-data" class="oe_import">
             <header>
                 <button type="button" disabled="disabled"
-                        class="oe_button oe_import_button oe_import_validate"
+                        class="oe_button oe_import_button oe_import_validate oe_highlight"
                     >Validate</button>
                 <button type="button" disabled="disabled"
                         class="oe_button oe_import_button oe_import_import"
-- 
cgit v1.2.3


From fa2bc110258b48842fa95d370440b9399dcf8571 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Wed, 3 Oct 2012 16:50:48 +0200
Subject: [IMP] formalize state transitions via an actual fsm

bzr revid: xmo@openerp.com-20121003145048-wdoo712j551jow3t
---
 addons/base_import/static/src/js/import.js | 90 +++++++++++++++++++-----------
 1 file changed, 56 insertions(+), 34 deletions(-)

(limited to 'addons/base_import/static/src')

diff --git a/addons/base_import/static/src/js/import.js b/addons/base_import/static/src/js/import.js
index 4135f303513..19d4e466cc7 100644
--- a/addons/base_import/static/src/js/import.js
+++ b/addons/base_import/static/src/js/import.js
@@ -71,14 +71,8 @@ openerp.base_import = function (instance) {
         ],
         events: {
             // 'change .oe_import_grid input': 'import_dryrun',
-            'change input.oe_import_file': 'file_update',
-            'change input.oe_import_has_header, .oe_import_options input': 'settings_updated',
-            'click a.oe_import_csv': function (e) {
-                e.preventDefault();
-            },
-            'click a.oe_import_export': function (e) {
-                e.preventDefault();
-            },
+            'change input.oe_import_file': 'loaded_file',
+            'change input.oe_import_has_header, .oe_import_options input': 'settings_changed',
             'click a.oe_import_toggle': function (e) {
                 e.preventDefault();
                 var $el = $(e.target);
@@ -109,14 +103,15 @@ openerp.base_import = function (instance) {
                 this.do_action(_.extend(action, {target: 'new'}));
             },
             // buttons
-            'click .oe_import_validate': 'import_dryrun',
-            'click .oe_import_import': 'do_import',
+            'click .oe_import_validate': 'validate',
+            'click .oe_import_import': 'import',
             'click .oe_import_cancel': function (e) {
                 e.preventDefault();
                 this.exit();
             }
         },
         init: function (parent, params) {
+            var self = this;
             this._super.apply(this, arguments);
             this.res_model = params.model;
             // import object id
@@ -150,42 +145,48 @@ openerp.base_import = function (instance) {
         },
 
         //- File & settings change section
-        file_update: function (e) {
+        onfile_loaded: function () {
             this.$('.oe_import_button').prop('disabled', true);
             if (!this.$('input.oe_import_file').val()) { return; }
 
             this.$el.removeClass('oe_import_preview oe_import_error');
             jsonp(this.$el, {
                 url: '/base_import/set_file'
-            }, this.proxy('settings_updated'));
+            }, this.proxy('settings_changed'));
         },
-        settings_updated: function () {
+        onpreviewing: function () {
+            var self = this;
+            this.$('.oe_import_button').prop('disabled', true);
             this.$el.addClass('oe_import_with_file');
             // TODO: test that write // succeeded?
-            this.Import.call(
-                'parse_preview', [this.id, this.import_options()])
-                .then(this.proxy('preview'));
-        },
-        preview: function (result) {
             this.$el.removeClass('oe_import_preview_error oe_import_error');
             this.$el.toggleClass(
                 'oe_import_noheaders',
                 !this.$('input.oe_import_has_header').prop('checked'));
-            if (result.error) {
-                this.$('.oe_import_options').show();
-                this.$el.addClass('oe_import_preview_error oe_import_error');
-                this.$('.oe_import_error_report').html(
-                        QWeb.render('ImportView.preview.error', result))
-                    .get(0).scrollIntoView();
-                return;
-            }
+            this.Import.call(
+                'parse_preview', [this.id, this.import_options()])
+                .then(function (result) {
+                    var signal = result.error ? 'preview_failed' : 'preview_succeeded';
+                    self[signal](result);
+                });
+        },
+        onpreview_error: function (event, from, to, result) {
+            this.$('.oe_import_options').show();
+            this.$el.addClass('oe_import_preview_error oe_import_error');
+            this.$('.oe_import_error_report').html(
+                    QWeb.render('ImportView.preview.error', result))
+                .get(0).scrollIntoView();
+        },
+        onpreview_success: function (event, from, to, result) {
+            this.$('.oe_import_import').removeClass('oe_highlight');
+            this.$('.oe_import_validate').addClass('oe_highlight');
             this.$('.oe_import_button').prop('disabled', false);
             this.$el.addClass('oe_import_preview');
             this.$('table').html(QWeb.render('ImportView.preview', result));
 
             if (result.headers.length === 1) {
                 this.$('.oe_import_options').show();
-                this.render_import_result([{
+                this.onresults(null, null, null, [{
                     type: 'warning',
                     message: _t("A single column was found in the file, this often means the file separator is incorrect")
                 }]);
@@ -225,7 +226,6 @@ openerp.base_import = function (instance) {
                 width: 'resolve',
                 dropdownCssClass: 'oe_import_selector'
             });
-            //this.import_dryrun();
         },
         generate_fields_completion: function (root) {
             var basic = [];
@@ -303,28 +303,31 @@ openerp.base_import = function (instance) {
             return this.Import.call(
                 'do', [this.id, fields, this.import_options()], options);
         },
-        import_dryrun: function () {
+        onvalidate: function () {
             return this.call_import({ dryrun: true })
-                .then(this.proxy('render_import_result'));
+                .then(this.proxy('validated'));
         },
-        do_import: function () {
+        onimport: function () {
             var self = this;
             return this.call_import({ dryrun: false }).then(function (message) {
                 if (!_.any(message, function (message) {
                         return message.type === 'error' })) {
-                    self.exit();
+                    self['import_succeeded']();
                     return;
                 }
-                self.render_import_result(message);
+                self['import_failed'](message);
             });
         },
+        onimported: function () {
+            this.exit();
+        },
         exit: function () {
             this.do_action({
                 type: 'ir.actions.client',
                 tag: 'history_back'
             });
         },
-        render_import_result: function (message) {
+        onresults: function (event, from, to, message) {
             var no_messages = _.isEmpty(message);
             this.$('.oe_import_import').toggleClass('oe_highlight', no_messages);
             this.$('.oe_import_validate').toggleClass('oe_highlight', !no_messages);
@@ -386,4 +389,23 @@ openerp.base_import = function (instance) {
                 })).get(0).scrollIntoView();
         },
     });
+    // FSM-ize DataImport
+    StateMachine.create({
+        target: instance.web.DataImport.prototype,
+        events: [
+            { name: 'loaded_file',
+              from: ['none', 'file_loaded', 'preview_error', 'preview_success', 'results'],
+              to: 'file_loaded' },
+            { name: 'settings_changed',
+              from: ['file_loaded', 'preview_error', 'preview_success', 'results'],
+              to: 'previewing' },
+            { name: 'preview_failed', from: 'previewing', to: 'preview_error' },
+            { name: 'preview_succeeded', from: 'previewing', to: 'preview_success' },
+            { name: 'validate', from: 'preview_success', to: 'validating' },
+            { name: 'validated', from: 'validating', to: 'results' },
+            { name: 'import', from: ['preview_success', 'results'], to: 'importing' },
+            { name: 'import_succeeded', from: 'importing', to: 'imported'},
+            { name: 'import_failed', from: 'importing', to: 'results' }
+        ]
+    })
 };
-- 
cgit v1.2.3


From 9c9d9781093cf35bb5abec0d605a02bbd9b3f108 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Wed, 3 Oct 2012 17:24:44 +0200
Subject: [IMP] relational field 'more values' dialog list features

force display of pager and search view, make list non-selectable

bzr revid: xmo@openerp.com-20121003152444-phnn9sc9nqo1ecpn
---
 addons/base_import/static/src/js/import.js | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

(limited to 'addons/base_import/static/src')

diff --git a/addons/base_import/static/src/js/import.js b/addons/base_import/static/src/js/import.js
index 19d4e466cc7..2867242749c 100644
--- a/addons/base_import/static/src/js/import.js
+++ b/addons/base_import/static/src/js/import.js
@@ -100,7 +100,15 @@ openerp.base_import = function (instance) {
                           : 'tree'
                     ];
                 });
-                this.do_action(_.extend(action, {target: 'new'}));
+                this.do_action(_.extend(action, {
+                    target: 'new',
+                    flags: {
+                        search_view: true,
+                        display_title: true,
+                        pager: true,
+                        list: {selectable: false}
+                    }
+                }));
             },
             // buttons
             'click .oe_import_validate': 'validate',
-- 
cgit v1.2.3


From 82e849e180c89698fd86fb1e6aa9a6d59119216e Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Thu, 4 Oct 2012 10:32:31 +0200
Subject: [FIX] base_import: should be possible to re-validate a file after a
 failed import or validation

bzr revid: xmo@openerp.com-20121004083231-qyl8l58wyhb7g2c3
---
 addons/base_import/static/src/js/import.js | 1 +
 1 file changed, 1 insertion(+)

(limited to 'addons/base_import/static/src')

diff --git a/addons/base_import/static/src/js/import.js b/addons/base_import/static/src/js/import.js
index 2867242749c..937565a24e8 100644
--- a/addons/base_import/static/src/js/import.js
+++ b/addons/base_import/static/src/js/import.js
@@ -410,6 +410,7 @@ openerp.base_import = function (instance) {
             { name: 'preview_failed', from: 'previewing', to: 'preview_error' },
             { name: 'preview_succeeded', from: 'previewing', to: 'preview_success' },
             { name: 'validate', from: 'preview_success', to: 'validating' },
+            { name: 'validate', from: 'results', to: 'validating' },
             { name: 'validated', from: 'validating', to: 'results' },
             { name: 'import', from: ['preview_success', 'results'], to: 'importing' },
             { name: 'import_succeeded', from: 'importing', to: 'imported'},
-- 
cgit v1.2.3


From 8f3db5bcf1f1eb6eb505e9847536fd8d26e46497 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Thu, 4 Oct 2012 12:22:36 +0200
Subject: [IMP] move file format options from below preview table to below file
 field

bzr revid: xmo@openerp.com-20121004102236-auj053d38tp5fpvy
---
 addons/base_import/static/src/css/import.css |  2 +-
 addons/base_import/static/src/xml/import.xml | 26 ++++++++++++++------------
 2 files changed, 15 insertions(+), 13 deletions(-)

(limited to 'addons/base_import/static/src')

diff --git a/addons/base_import/static/src/css/import.css b/addons/base_import/static/src/css/import.css
index 25678cbe98a..21e598ff707 100644
--- a/addons/base_import/static/src/css/import.css
+++ b/addons/base_import/static/src/css/import.css
@@ -52,7 +52,7 @@
 }
 .oe_import .oe_import_options label {
     display: inline-block;
-    width: 10em;
+    width: 8em;
     text-align: right;
 }
 
diff --git a/addons/base_import/static/src/xml/import.xml b/addons/base_import/static/src/xml/import.xml
index b0eea1fcf75..91debd64897 100644
--- a/addons/base_import/static/src/xml/import.xml
+++ b/addons/base_import/static/src/xml/import.xml
@@ -24,6 +24,20 @@
             <label t-attf-for="file_#{_id}" autofocus="autofocus">CSV File:</label>
             <input type="file" id-attf-id="file_#{_id}"
                    name="file" class="oe_import_file"/>
+            <div class="oe_import_with_file">
+                <a href="#" class="oe_import_toggle">
+                    File Format Options…</a>
+                <div class="oe_import_toggled oe_import_options">
+                    <p t-foreach="widget.opts" t-as="option">
+                        <!-- no @name, avoid submission when file_update called -->
+                        <label t-attf-for="#{option.name}_#{_id}">
+                            <t t-esc="option.label"/></label>
+                        <input t-attf-id="#{option.name}_#{_id}"
+                               t-attf-class="oe_import_#{option.name}"
+                               t-att-value="option.value"/>
+                    </p>
+                </div>
+            </div>
 
             <div class="oe_import_with_file">
                 <h2>Map your data to OpenERP</h2>
@@ -38,18 +52,6 @@
 
                 <div class="oe_import_error_report"></div>
                 <table class="oe_import_grid" width="100%"/>
-                <a href="#" class="oe_import_toggle">
-                    File Format Options…</a>
-                <div class="oe_import_toggled oe_import_options">
-                    <p t-foreach="widget.opts" t-as="option">
-                        <!-- no @name, avoid submission when file_update called -->
-                        <label t-attf-for="#{option.name}_#{_id}">
-                            <t t-esc="option.label"/></label>
-                        <input t-attf-id="#{option.name}_#{_id}"
-                               t-attf-class="oe_import_#{option.name}"
-                               t-att-value="option.value"/>
-                    </p>
-                </div>
 
                 <h2>Frequently Asked Questions</h2>
                 <dl>
-- 
cgit v1.2.3


From 1b17b59f50b73c927f1283901003d6ea793785af Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Thu, 4 Oct 2012 13:50:24 +0200
Subject: [IMP] base_import: provide an encoding picker

bzr revid: xmo@openerp.com-20121004115024-m77q5c95i12q3qkm
---
 addons/base_import/static/src/js/import.js | 23 +++++++++++++++++++++--
 1 file changed, 21 insertions(+), 2 deletions(-)

(limited to 'addons/base_import/static/src')

diff --git a/addons/base_import/static/src/js/import.js b/addons/base_import/static/src/js/import.js
index 937565a24e8..551196678a3 100644
--- a/addons/base_import/static/src/js/import.js
+++ b/addons/base_import/static/src/js/import.js
@@ -128,6 +128,7 @@ openerp.base_import = function (instance) {
         },
         start: function () {
             var self = this;
+            this.setup_encoding_picker();
 
             return $.when(
                 this._super(),
@@ -139,6 +140,25 @@ openerp.base_import = function (instance) {
                 })
             )
         },
+        setup_encoding_picker: function () {
+            this.$('input.oe_import_encoding').select2({
+                width: '160px',
+                query: function (q) {
+                    var make = function (term) { return {id: term, text: term}; };
+                    var suggestions = _.map(
+                        ('utf-8 utf-16 windows-1252 latin1 latin2 big5 ' +
+                         'gb18030 shift_jis windows-1251 koir8_r').split(/\s+/),
+                        make);
+                    if (q.term) {
+                        suggestions.unshift(make(q.term));
+                    }
+                    q.callback({results: suggestions});
+                },
+                initSelection: function (e, c) {
+                    return c({id: 'utf-8', text: 'utf-8'});
+                }
+            }).select2('val', 'utf-8');
+        },
 
         import_options: function () {
             var self = this;
@@ -182,8 +202,7 @@ openerp.base_import = function (instance) {
             this.$('.oe_import_options').show();
             this.$el.addClass('oe_import_preview_error oe_import_error');
             this.$('.oe_import_error_report').html(
-                    QWeb.render('ImportView.preview.error', result))
-                .get(0).scrollIntoView();
+                    QWeb.render('ImportView.preview.error', result));
         },
         onpreview_success: function (event, from, to, result) {
             this.$('.oe_import_import').removeClass('oe_highlight');
-- 
cgit v1.2.3


From 25f695a650079d68fabb96a923c4d7411a27cd98 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Thu, 4 Oct 2012 15:38:40 +0200
Subject: [IMP] pass restore callback to import action

so that the listview can reload itself after coming back from an
import (successful or not) and show the results of the import.

bzr revid: xmo@openerp.com-20121004133840-a2uy4s5qhpqqvp8h
---
 addons/base_import/static/src/js/import.js | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'addons/base_import/static/src')

diff --git a/addons/base_import/static/src/js/import.js b/addons/base_import/static/src/js/import.js
index 551196678a3..5980eb2384c 100644
--- a/addons/base_import/static/src/js/import.js
+++ b/addons/base_import/static/src/js/import.js
@@ -53,6 +53,8 @@ openerp.base_import = function (instance) {
                         params: {
                             model: self.dataset.model
                         }
+                    }, void 0, void 0, function () {
+                        self.reload();
                     });
                     return false;
                 });
-- 
cgit v1.2.3


From 775fe69fc10603c8b859e2c2554827f74f0405fc Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Mon, 8 Oct 2012 15:08:56 +0200
Subject: [IMP] base_import: always open CSV link in new window

bzr revid: xmo@openerp.com-20121008130856-fw0p92lofx7u27b2
---
 addons/base_import/static/src/xml/import.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'addons/base_import/static/src')

diff --git a/addons/base_import/static/src/xml/import.xml b/addons/base_import/static/src/xml/import.xml
index 91debd64897..adca0579f8f 100644
--- a/addons/base_import/static/src/xml/import.xml
+++ b/addons/base_import/static/src/xml/import.xml
@@ -18,7 +18,7 @@
             <h2>Upload your file</h2>
             <p>Select the <a
                     href="http://en.wikipedia.org/wiki/Comma-separated_values"
-                    class="oe_import_csv">.CSV</a>
+                    class="oe_import_csv" target="_blank">.CSV</a>
             file to import. If you need a sample importable file, you
             can use the export tool to generate one.</p>
             <label t-attf-for="file_#{_id}" autofocus="autofocus">CSV File:</label>
-- 
cgit v1.2.3


From 4dd9a0529e79eccb7670a180c5d88fad144fa4c9 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Wed, 10 Oct 2012 12:18:36 +0200
Subject: [ADD] reload file button next to the file input, as webkit browsers
 and MSIE don't trigger change when a file input is re-set to thee same file

Using other events (e.g. 'click') is not kosher as the event is
triggered long before the file is picked, the alternative is to use
the File API and regularly check the file in the input to see if it's
been altered (by storing a crc) and re-pushing it if the hash is
different. Of course this has other issues (risks catching the file
mid-edition...)

A third alternative is, once a file has been uploaded, to clear and
re-insert the corresponding file input. This means the file input will
*always* be empty

bzr revid: xmo@openerp.com-20121010101836-qtqmcc5n5zblgmcp
---
 addons/base_import/static/src/css/import.css | 19 +++++++++++++++++++
 addons/base_import/static/src/js/import.js   |  3 ++-
 addons/base_import/static/src/xml/import.xml |  1 +
 3 files changed, 22 insertions(+), 1 deletion(-)

(limited to 'addons/base_import/static/src')

diff --git a/addons/base_import/static/src/css/import.css b/addons/base_import/static/src/css/import.css
index 21e598ff707..3b4daf815e5 100644
--- a/addons/base_import/static/src/css/import.css
+++ b/addons/base_import/static/src/css/import.css
@@ -60,3 +60,22 @@
 .oe_import_selector li {
     margin: 0; padding: 0;
 }
+
+.oe_import .oe_import_file_reload {
+    font-size: 1px;
+    letter-spacing: -1px;
+    color: transparent;
+    font-weight: normal;
+    position: relative;
+    padding: 0;
+    height: 19px;
+    width: 20px;
+}
+.oe_import .oe_import_file_reload:before {
+    font: 26px "mnmliconsRegular";
+    content: "Q";
+    color: #4C4C4C;
+    position: absolute;
+    top: -6px;
+    left: 2px;
+}
diff --git a/addons/base_import/static/src/js/import.js b/addons/base_import/static/src/js/import.js
index 5980eb2384c..0a60fe18ffb 100644
--- a/addons/base_import/static/src/js/import.js
+++ b/addons/base_import/static/src/js/import.js
@@ -73,7 +73,8 @@ openerp.base_import = function (instance) {
         ],
         events: {
             // 'change .oe_import_grid input': 'import_dryrun',
-            'change input.oe_import_file': 'loaded_file',
+            'change .oe_import_file': 'loaded_file',
+            'click .oe_import_file_reload': 'loaded_file',
             'change input.oe_import_has_header, .oe_import_options input': 'settings_changed',
             'click a.oe_import_toggle': function (e) {
                 e.preventDefault();
diff --git a/addons/base_import/static/src/xml/import.xml b/addons/base_import/static/src/xml/import.xml
index adca0579f8f..902478468e1 100644
--- a/addons/base_import/static/src/xml/import.xml
+++ b/addons/base_import/static/src/xml/import.xml
@@ -24,6 +24,7 @@
             <label t-attf-for="file_#{_id}" autofocus="autofocus">CSV File:</label>
             <input type="file" id-attf-id="file_#{_id}"
                    name="file" class="oe_import_file"/>
+            <button type="button" class="oe_import_file_reload">Reload File</button>
             <div class="oe_import_with_file">
                 <a href="#" class="oe_import_toggle">
                     File Format Options…</a>
-- 
cgit v1.2.3


From f8a29989c8d921732956f9ba7f81a69b048056de Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Wed, 10 Oct 2012 13:27:31 +0200
Subject: [IMP] base_import: simplify styling of looks button

bzr revid: xmo@openerp.com-20121010112731-flw3bkijm229mr53
---
 addons/base_import/static/src/css/import.css | 19 -------------------
 addons/base_import/static/src/xml/import.xml |  4 +++-
 2 files changed, 3 insertions(+), 20 deletions(-)

(limited to 'addons/base_import/static/src')

diff --git a/addons/base_import/static/src/css/import.css b/addons/base_import/static/src/css/import.css
index 3b4daf815e5..21e598ff707 100644
--- a/addons/base_import/static/src/css/import.css
+++ b/addons/base_import/static/src/css/import.css
@@ -60,22 +60,3 @@
 .oe_import_selector li {
     margin: 0; padding: 0;
 }
-
-.oe_import .oe_import_file_reload {
-    font-size: 1px;
-    letter-spacing: -1px;
-    color: transparent;
-    font-weight: normal;
-    position: relative;
-    padding: 0;
-    height: 19px;
-    width: 20px;
-}
-.oe_import .oe_import_file_reload:before {
-    font: 26px "mnmliconsRegular";
-    content: "Q";
-    color: #4C4C4C;
-    position: absolute;
-    top: -6px;
-    left: 2px;
-}
diff --git a/addons/base_import/static/src/xml/import.xml b/addons/base_import/static/src/xml/import.xml
index 902478468e1..1c57c40c9db 100644
--- a/addons/base_import/static/src/xml/import.xml
+++ b/addons/base_import/static/src/xml/import.xml
@@ -24,7 +24,9 @@
             <label t-attf-for="file_#{_id}" autofocus="autofocus">CSV File:</label>
             <input type="file" id-attf-id="file_#{_id}"
                    name="file" class="oe_import_file"/>
-            <button type="button" class="oe_import_file_reload">Reload File</button>
+            <button type="button" class="oe_import_file_reload">
+                <img src="/web/static/src/img/icons/gtk-refresh.png"/>
+            </button>
             <div class="oe_import_with_file">
                 <a href="#" class="oe_import_toggle">
                     File Format Options…</a>
-- 
cgit v1.2.3


From 4fcdf9d10844c27f25a53a723945708ef32a5528 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Fri, 12 Oct 2012 16:03:17 +0200
Subject: [CHG] don't scroll to the info messages after a validation or a
 failed import

as asked by fp

bzr revid: xmo@openerp.com-20121012140317-3m6nh1zb7ib1om09
---
 addons/base_import/static/src/js/import.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'addons/base_import/static/src')

diff --git a/addons/base_import/static/src/js/import.js b/addons/base_import/static/src/js/import.js
index 0a60fe18ffb..33c86e88b2c 100644
--- a/addons/base_import/static/src/js/import.js
+++ b/addons/base_import/static/src/js/import.js
@@ -416,7 +416,7 @@ openerp.base_import = function (instance) {
                             '</div>'
                         ].join('')
                     },
-                })).get(0).scrollIntoView();
+                }));
         },
     });
     // FSM-ize DataImport
-- 
cgit v1.2.3