From 105428c561bd5c569953dca0104fcaf3ce4bc174 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Bernd=20Ble=C3=9Fmann?= Date: Tue, 24 Jan 2017 18:05:27 +0100 Subject: [PATCH] CsvImport: nicht mehr benutzte Templates des synchronen Csv-Imports entfernen. --- templates/webpages/csv_import/_errors.html | 20 --------- templates/webpages/csv_import/_preview.html | 48 --------------------- templates/webpages/csv_import/_result.html | 9 ---- templates/webpages/csv_import/_results.html | 12 ------ templates/webpages/csv_import/form.html | 2 - 5 files changed, 91 deletions(-) delete mode 100644 templates/webpages/csv_import/_errors.html delete mode 100644 templates/webpages/csv_import/_preview.html delete mode 100644 templates/webpages/csv_import/_result.html delete mode 100644 templates/webpages/csv_import/_results.html diff --git a/templates/webpages/csv_import/_errors.html b/templates/webpages/csv_import/_errors.html deleted file mode 100644 index 1a7d661cf..000000000 --- a/templates/webpages/csv_import/_errors.html +++ /dev/null @@ -1,20 +0,0 @@ -[% USE LxERP %] - -

[%- LxERP.t8('Errors') %]

- -

[%- LxERP.t8('Found #1 errors.', SELF.errors.size) %]

- - - - - - - - [% FOREACH err = SELF.errors %] - - - - - - [% END %] -
[%- LxERP.t8('Line and column') %][%- LxERP.t8('Block') %][%- LxERP.t8('Error') %]
[% err.4 %]:[% err.3 %][% err.0 %][% err.2 %]
diff --git a/templates/webpages/csv_import/_preview.html b/templates/webpages/csv_import/_preview.html deleted file mode 100644 index 01fe4d9ff..000000000 --- a/templates/webpages/csv_import/_preview.html +++ /dev/null @@ -1,48 +0,0 @@ -[% USE HTML %] -[% USE LxERP %] - -[% IF SELF.data.size %] -

- [%- IF SELF.import_status == 'tested' %] - [%- LxERP.t8('Import preview') %] - [%- ELSE %] - [%- LxERP.t8('Import result') %] - [%- END %] -

- - - - [%- FOREACH column = SELF.info_headers.headers %] - - [%- END %] - [%- FOREACH column = SELF.headers.headers %] - - [%- END %] - [%- FOREACH column = SELF.raw_data_headers.headers %] - - [%- END %] - - - - [%- FOREACH row = SELF.data %] - [%- IF (SELF.profile.get('full_preview') == 2) || ((SELF.profile.get('full_preview') == 1) && (row.errors.size || row.information.size)) || ((SELF.profile.get('full_preview') == 0) && (loop.count < 21)) %] - - [%- FOREACH method = SELF.info_headers.methods %] - - [%- END %] - [%- FOREACH method = SELF.headers.methods %] - - [%- END %] - [%- FOREACH method = SELF.raw_data_headers.headers %] - - [%- END %] - - - [%- END %] - [%- END %] - -
[%- HTML.escape(column) %][%- HTML.escape(column) %][%- HTML.escape(column) %][%- LxERP.t8('Notes') %]
[%- HTML.escape(row.info_data.$method) %][%- HTML.escape(row.object.$method) %][%- HTML.escape(row.raw_data.$method) %] - [%- FOREACH error = row.errors %][%- HTML.escape(error) %][% UNLESS loop.last %]
[%- END %][%- END %] - [%- FOREACH info = row.information %][% IF !loop.first || row.errors.size %]
[%- END %][%- HTML.escape(info) %][%- END %] -
-[%- END %] diff --git a/templates/webpages/csv_import/_result.html b/templates/webpages/csv_import/_result.html deleted file mode 100644 index b67bb7fbc..000000000 --- a/templates/webpages/csv_import/_result.html +++ /dev/null @@ -1,9 +0,0 @@ -[% USE LxERP %] - -

[%- LxERP.t8('Import summary') %]

- -[%- IF SELF.import_status == 'imported' %] -

[%- LxERP.t8('#1 of #2 importable objects were imported.', SELF.num_imported, SELF.num_importable || 0) %]

-[%- ELSE %] -

[%- LxERP.t8('Found #1 objects of which #2 can be imported.', SELF.data.size || 0, SELF.num_importable || 0) %]

-[%- END %] diff --git a/templates/webpages/csv_import/_results.html b/templates/webpages/csv_import/_results.html deleted file mode 100644 index 56ec9334a..000000000 --- a/templates/webpages/csv_import/_results.html +++ /dev/null @@ -1,12 +0,0 @@ - [%- IF SELF.errors %] - [%- PROCESS 'csv_import/_errors.html' %] - [%- END %] - - [%- PROCESS 'csv_import/_result.html' %] - [%- PROCESS 'csv_import/_preview.html' %] - -[% IF progress == 100 %] - -[% END %] diff --git a/templates/webpages/csv_import/form.html b/templates/webpages/csv_import/form.html index 1ab545384..c3cbcac2e 100644 --- a/templates/webpages/csv_import/form.html +++ b/templates/webpages/csv_import/form.html @@ -338,8 +338,6 @@
[%- IF SELF.deferred %] [%- PROCESS 'csv_import/_deferred_results.html' %] - [%- ELSIF SELF.import_status %] - [%- PROCESS 'csv_import/_results.html' %] [%- END %]
-- 2.20.1