You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by jo...@apache.org on 2021/06/21 09:03:33 UTC
[isis] branch ISIS-2505_Catch_Up_With_Demo_Examples updated:
ISIS-2505 Parented Table shows up with 2/4 Column headers, but no data yet
This is an automated email from the ASF dual-hosted git repository.
joergrade pushed a commit to branch ISIS-2505_Catch_Up_With_Demo_Examples
in repository https://gitbox.apache.org/repos/asf/isis.git
The following commit(s) were added to refs/heads/ISIS-2505_Catch_Up_With_Demo_Examples by this push:
new 79f5f42 ISIS-2505 Parented Table shows up with 2/4 Column headers, but no data yet
79f5f42 is described below
commit 79f5f429560916a8772f0228779646cd8cfa0199
Author: Jörg Rade <jo...@kuehne-nagel.com>
AuthorDate: Mon Jun 21 11:02:15 2021 +0200
ISIS-2505 Parented Table shows up with 2/4 Column headers, but no data yet
---
.../isis/client/kroviz/core/aggregator/CollectionAggregator.kt | 8 +++++++-
.../org/apache/isis/client/kroviz/core/model/CollectionDM.kt | 2 ++
.../org/apache/isis/client/kroviz/ui/dialog/EventLogDetail.kt | 2 +-
3 files changed, 10 insertions(+), 2 deletions(-)
diff --git a/incubator/clients/kroviz/src/main/kotlin/org/apache/isis/client/kroviz/core/aggregator/CollectionAggregator.kt b/incubator/clients/kroviz/src/main/kotlin/org/apache/isis/client/kroviz/core/aggregator/CollectionAggregator.kt
index 400788a..89cad1b 100644
--- a/incubator/clients/kroviz/src/main/kotlin/org/apache/isis/client/kroviz/core/aggregator/CollectionAggregator.kt
+++ b/incubator/clients/kroviz/src/main/kotlin/org/apache/isis/client/kroviz/core/aggregator/CollectionAggregator.kt
@@ -87,10 +87,16 @@ class CollectionAggregator(actionTitle: String, val parent: ObjectAggregator? =
console.log("[CA.handleDomainType]")
obj.links.forEach {
if (it.relation() == Relation.LAYOUT) {
- console.log(it)
invoke(it, this)
}
}
+ obj.members.forEach {
+ val m = it.value
+ if (m.isProperty()) {
+ console.log(m)
+ invoke(m, this)
+ }
+ }
}
private fun handleGrid(grid: Grid) {
diff --git a/incubator/clients/kroviz/src/main/kotlin/org/apache/isis/client/kroviz/core/model/CollectionDM.kt b/incubator/clients/kroviz/src/main/kotlin/org/apache/isis/client/kroviz/core/model/CollectionDM.kt
index e3eab03..ef61c23 100644
--- a/incubator/clients/kroviz/src/main/kotlin/org/apache/isis/client/kroviz/core/model/CollectionDM.kt
+++ b/incubator/clients/kroviz/src/main/kotlin/org/apache/isis/client/kroviz/core/model/CollectionDM.kt
@@ -42,6 +42,8 @@ class CollectionDM(override val title: String) : DisplayModelWithLayout() {
// canBeDisplayed checks for grid AND layout - for parented collection there seems to be no layout
fun parentedCollectionCanBeDisplayed(): Boolean {
+ console.log("[CDM.parentedCollectionCanBeDisplayed] propertyDescriptionList")
+ console.log(propertyDescriptionList)
return when {
grid == null -> false
propertyDescriptionList.isEmpty() -> false
diff --git a/incubator/clients/kroviz/src/main/kotlin/org/apache/isis/client/kroviz/ui/dialog/EventLogDetail.kt b/incubator/clients/kroviz/src/main/kotlin/org/apache/isis/client/kroviz/ui/dialog/EventLogDetail.kt
index 2f0f592..7059c30 100644
--- a/incubator/clients/kroviz/src/main/kotlin/org/apache/isis/client/kroviz/ui/dialog/EventLogDetail.kt
+++ b/incubator/clients/kroviz/src/main/kotlin/org/apache/isis/client/kroviz/ui/dialog/EventLogDetail.kt
@@ -43,10 +43,10 @@ class EventLogDetail(val logEntryFromTabulator: LogEntry) : Command() {
logEntry = EventStore.findBy(rs)?: logEntryFromTabulator // in case of xml, we use the entry passed in
}
+ // callback parameter
private val LOG: String = "log"
private val OBJ: String = "obj"
-
fun open() {
val responseStr = if (logEntry.subType == Constants.subTypeJson) {
Utils.format(logEntry.response)