projects
/
kivitendo-erp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Lieferadressen, gelöschte aber ausgewählte weiterhin einblenden.
[kivitendo-erp.git]
/
templates
/
webpages
/
csv_import
/
_preview.html
diff --git
a/templates/webpages/csv_import/_preview.html
b/templates/webpages/csv_import/_preview.html
index
08997b9
..
fe088e2
100644
(file)
--- a/
templates/webpages/csv_import/_preview.html
+++ b/
templates/webpages/csv_import/_preview.html
@@
-12,6
+12,9
@@
<table>
<tr class="listheading">
<table>
<tr class="listheading">
+ [%- FOREACH column = SELF.info_headers.headers %]
+ <th>[%- HTML.escape(column) %]</th>
+ [%- END %]
[%- FOREACH column = SELF.headers.headers %]
<th>[%- HTML.escape(column) %]</th>
[%- END %]
[%- FOREACH column = SELF.headers.headers %]
<th>[%- HTML.escape(column) %]</th>
[%- END %]
@@
-23,6
+26,9
@@
[%- FOREACH row = SELF.data %]
<tr class="[% IF row.errors.size %]redrow[% ELSE %]listrow[% END %][% loop.count % 2 %]">
[%- FOREACH row = SELF.data %]
<tr class="[% IF row.errors.size %]redrow[% ELSE %]listrow[% END %][% loop.count % 2 %]">
+ [%- FOREACH method = SELF.info_headers.methods %]
+ <td>[%- HTML.escape(row.info_data.$method) %]</td>
+ [%- END %]
[%- FOREACH method = SELF.headers.methods %]
<td>[%- HTML.escape(row.object.$method) %]</td>
[%- END %]
[%- FOREACH method = SELF.headers.methods %]
<td>[%- HTML.escape(row.object.$method) %]</td>
[%- END %]
@@
-31,6
+37,7
@@
[%- END %]
<td>
[%- FOREACH error = row.errors %][%- HTML.escape(error) %][% UNLESS loop.last %]<br>[%- END %][%- END %]
[%- END %]
<td>
[%- FOREACH error = row.errors %][%- HTML.escape(error) %][% UNLESS loop.last %]<br>[%- END %][%- END %]
+ [%- FOREACH info = row.information %][% IF !loop.first || row.errors.size %]<br>[%- END %][%- HTML.escape(info) %][%- END %]
</td>
</tr>
[%- END %]
</td>
</tr>
[%- END %]