From 6e38d9e8477f8870a0421fb344c3bf2ba6fb7598 Mon Sep 17 00:00:00 2001
From: srosse <stephane.rosse@frentix.com>
Date: Mon, 20 Jan 2020 16:12:58 +0100
Subject: [PATCH] OO-4479: show the external id. of taxonomy level in the
different trees
---
.../java/org/olat/modules/taxonomy/ui/TaxonomyLevelRow.java | 4 ++++
.../olat/modules/taxonomy/ui/TaxonomyTreeTableController.java | 1 +
.../org/olat/modules/taxonomy/ui/TaxonomyTreeTableModel.java | 2 ++
.../olat/modules/taxonomy/ui/_i18n/LocalStrings_de.properties | 2 +-
4 files changed, 8 insertions(+), 1 deletion(-)
diff --git a/src/main/java/org/olat/modules/taxonomy/ui/TaxonomyLevelRow.java b/src/main/java/org/olat/modules/taxonomy/ui/TaxonomyLevelRow.java
index 196546218e5..6bf00983c42 100644
--- a/src/main/java/org/olat/modules/taxonomy/ui/TaxonomyLevelRow.java
+++ b/src/main/java/org/olat/modules/taxonomy/ui/TaxonomyLevelRow.java
@@ -84,6 +84,10 @@ public class TaxonomyLevelRow implements TaxonomyLevelRef, FlexiTreeTableNode {
return taxonomyLevel.getIdentifier();
}
+ public String getExternalId() {
+ return taxonomyLevel.getExternalId();
+ }
+
public Long getTypeKey() {
return type == null ? null : type.getKey();
}
diff --git a/src/main/java/org/olat/modules/taxonomy/ui/TaxonomyTreeTableController.java b/src/main/java/org/olat/modules/taxonomy/ui/TaxonomyTreeTableController.java
index d5785c12e53..2c32b5a2e53 100644
--- a/src/main/java/org/olat/modules/taxonomy/ui/TaxonomyTreeTableController.java
+++ b/src/main/java/org/olat/modules/taxonomy/ui/TaxonomyTreeTableController.java
@@ -132,6 +132,7 @@ public class TaxonomyTreeTableController extends FormBasicController implements
treeNodeRenderer.setFlatBySearchAndFilter(true);
columnsModel.addFlexiColumnModel(new DefaultFlexiColumnModel(TaxonomyLevelCols.displayName, treeNodeRenderer));
columnsModel.addFlexiColumnModel(new DefaultFlexiColumnModel(TaxonomyLevelCols.identifier, "select"));
+ columnsModel.addFlexiColumnModel(new DefaultFlexiColumnModel(TaxonomyLevelCols.externalId, "select"));
columnsModel.addFlexiColumnModel(new DefaultFlexiColumnModel(TaxonomyLevelCols.typeIdentifier));
columnsModel.addFlexiColumnModel(new DefaultFlexiColumnModel(TaxonomyLevelCols.numOfChildren));
DefaultFlexiColumnModel selectColumn = new DefaultFlexiColumnModel("zoom", translate("zoom"), "tt-focus");
diff --git a/src/main/java/org/olat/modules/taxonomy/ui/TaxonomyTreeTableModel.java b/src/main/java/org/olat/modules/taxonomy/ui/TaxonomyTreeTableModel.java
index b39310bc86a..6dc95b42767 100644
--- a/src/main/java/org/olat/modules/taxonomy/ui/TaxonomyTreeTableModel.java
+++ b/src/main/java/org/olat/modules/taxonomy/ui/TaxonomyTreeTableModel.java
@@ -116,6 +116,7 @@ implements FilterableFlexiTableModel {
case key: return level.getKey();
case displayName: return level.getDisplayName();
case identifier: return level.getIdentifier();
+ case externalId: return level.getExternalId();
case typeIdentifier: return level.getTypeIdentifier();
case numOfChildren: return level.getNumberOfChildren();
case tools: return level.getToolsLink();
@@ -127,6 +128,7 @@ implements FilterableFlexiTableModel {
key("table.header.key"),
displayName("table.header.taxonomy.level.displayName"),
identifier("table.header.taxonomy.level.identifier"),
+ externalId("table.header.taxonomy.level.externalId"),
typeIdentifier("table.header.taxonomy.level.type.identifier"),
numOfChildren("table.header.taxonomy.level.num.children"),
tools("table.header.actions");
diff --git a/src/main/java/org/olat/modules/taxonomy/ui/_i18n/LocalStrings_de.properties b/src/main/java/org/olat/modules/taxonomy/ui/_i18n/LocalStrings_de.properties
index d1e27a8903d..e6c2fcf1c12 100644
--- a/src/main/java/org/olat/modules/taxonomy/ui/_i18n/LocalStrings_de.properties
+++ b/src/main/java/org/olat/modules/taxonomy/ui/_i18n/LocalStrings_de.properties
@@ -93,7 +93,7 @@ table.header.taxonomy.displayName=Taxonomie
table.header.taxonomy.externalId=Taxanomie Ext. Ref.
table.header.taxonomy.identifier=Taxonomie ID
table.header.taxonomy.level.displayName=Anzeigename
-table.header.taxonomy.level.externalId=Level Ext. Ref.
+table.header.taxonomy.level.externalId=Ebene Ext. Ref.
table.header.taxonomy.level.identifier=Kennzeichen
table.header.taxonomy.level.num.children=Anzahl
table.header.taxonomy.level.type=Ebenentyp
--
GitLab