You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by ah...@apache.org on 2021/09/10 17:38:17 UTC
[isis] branch master updated: ISIS-2870: fixes Excel Export column
naming
This is an automated email from the ASF dual-hosted git repository.
ahuber pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/isis.git
The following commit(s) were added to refs/heads/master by this push:
new d0a8554 ISIS-2870: fixes Excel Export column naming
d0a8554 is described below
commit d0a8554fbc3c073e6b301f9be60431a54752b4b9
Author: Andi Huber <ah...@apache.org>
AuthorDate: Fri Sep 10 19:38:08 2021 +0200
ISIS-2870: fixes Excel Export column naming
---
.../viewer/wicket/exceldownload/ui/components/ExcelFileModel.java | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/extensions/vw/exceldownload/ui/src/main/java/org/apache/isis/extensions/viewer/wicket/exceldownload/ui/components/ExcelFileModel.java b/extensions/vw/exceldownload/ui/src/main/java/org/apache/isis/extensions/viewer/wicket/exceldownload/ui/components/ExcelFileModel.java
index 1a5fd18..65976b5 100644
--- a/extensions/vw/exceldownload/ui/src/main/java/org/apache/isis/extensions/viewer/wicket/exceldownload/ui/components/ExcelFileModel.java
+++ b/extensions/vw/exceldownload/ui/src/main/java/org/apache/isis/extensions/viewer/wicket/exceldownload/ui/components/ExcelFileModel.java
@@ -29,6 +29,7 @@ import java.time.LocalDateTime;
import java.time.OffsetDateTime;
import java.util.Date;
import java.util.List;
+import java.util.function.UnaryOperator;
import org.apache.poi.ss.usermodel.Cell;
import org.apache.poi.ss.usermodel.CellStyle;
@@ -111,7 +112,8 @@ class ExcelFileModel extends LoadableDetachableModel<File> {
int i=0;
for (ObjectAssociation property : columnProperties) {
final Cell cell = row.createCell((short) i++);
- cell.setCellValue(property.getFriendlyName(model::getParentObject));
+ cell.setCellValue(property.getStaticOrCanonicalFriendlyName()
+ .fold(UnaryOperator.identity(), UnaryOperator.identity()));
}
final CellStyle dateCellStyle = createDateFormatCellStyle(wb);