diff options
| author | Xavier Morel <xmo@openerp.com> | 2012-08-14 16:14:56 +0200 |
|---|---|---|
| committer | Xavier Morel <xmo@openerp.com> | 2012-08-14 16:14:56 +0200 |
| commit | 8fa23a95186edd2f5bf6f223337d34f3a4e55e70 (patch) | |
| tree | b5fb09b151d4b3d846b13f57e5e205cc263d7447 /addons/base_import/static/src/xml | |
| parent | 323b979146d6e0ba428a3e15e98f112cf9f80d43 (diff) | |
[ADD] actual importing, no fields matching yet
also no error pinpointing because API does not allow for it currently
bzr revid: xmo@openerp.com-20120814141456-zh9kdbjy8wj1sxys
Diffstat (limited to 'addons/base_import/static/src/xml')
| -rw-r--r-- | addons/base_import/static/src/xml/import.xml | 17 |
1 files changed, 15 insertions, 2 deletions
diff --git a/addons/base_import/static/src/xml/import.xml b/addons/base_import/static/src/xml/import.xml index 7cf04c55292..483c9a4a3cb 100644 --- a/addons/base_import/static/src/xml/import.xml +++ b/addons/base_import/static/src/xml/import.xml @@ -7,9 +7,9 @@ <label for="csvfile">CSV File:</label> <input type="file" id="csvfile" name="file" class="oe_import_file"/> + <div class="oe_import_error_report"></div> <table class="oe_import_grid" width="100%"> </table> - <div class="oe_import_error_report"></div> </form> </t> <!-- TODO: column matcher? --> @@ -18,14 +18,27 @@ <td t-foreach="headers" t-as="header" class="oe_import_grid-cell" ><t t-esc="header"/></td> </tr> + <tr class="oe_import_fields"> + <!-- Iterate on first row to ensure we have all columns --> + <td t-foreach="preview[0]" t-as="column"> + <input placeholder="Don't Import"/> + </td> + </tr> <tr t-foreach="preview" t-as="row" class="oe_import_grid-row"> <td t-foreach="row" t-as="cell" class="oe_import_grid-cell" ><t t-esc="cell"/></td> </tr> </t> - <t t-name="ImportView.error"> + <t t-name="ImportView.preview.error"> <p>Import preview failed due to: <t t-esc="error"/></p> <p>Here is the start of the file we could not import:</p> <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> + </ul> </templates> |