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/xml/import.xml | 26 ++++++++++++++++++++++----
 1 file changed, 22 insertions(+), 4 deletions(-)

(limited to 'addons/base_import/static/src/xml/import.xml')

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/xml/import.xml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'addons/base_import/static/src/xml/import.xml')

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 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/xml/import.xml')

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 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/xml/import.xml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'addons/base_import/static/src/xml/import.xml')

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/xml/import.xml | 10 ++++++++++
 1 file changed, 10 insertions(+)

(limited to 'addons/base_import/static/src/xml/import.xml')

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/xml/import.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'addons/base_import/static/src/xml/import.xml')

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 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/xml/import.xml | 26 ++++++++++++++------------
 1 file changed, 14 insertions(+), 12 deletions(-)

(limited to 'addons/base_import/static/src/xml/import.xml')

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 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/xml/import.xml')

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/xml/import.xml | 1 +
 1 file changed, 1 insertion(+)

(limited to 'addons/base_import/static/src/xml/import.xml')

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/xml/import.xml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'addons/base_import/static/src/xml/import.xml')

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