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 2020/04/04 06:44:27 UTC

[isis] 01/05: ISIS-2324 Fix Object layout

This is an automated email from the ASF dual-hosted git repository.

joergrade pushed a commit to branch ISIS-2324-Merge-kroviz
in repository https://gitbox.apache.org/repos/asf/isis.git

commit 166d677db01017a247c9bafef67b76505c8dea1d
Author: Jörg Rade <jo...@kuehne-nagel.com>
AuthorDate: Tue Mar 31 15:33:11 2020 +0200

    ISIS-2324 Fix Object layout
---
 .../apache/isis/client/kroviz/core/aggregator/ObjectAggregator.kt   | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/incubator/clients/kroviz/src/main/kotlin/org/apache/isis/client/kroviz/core/aggregator/ObjectAggregator.kt b/incubator/clients/kroviz/src/main/kotlin/org/apache/isis/client/kroviz/core/aggregator/ObjectAggregator.kt
index 6a69a4f..966a257 100644
--- a/incubator/clients/kroviz/src/main/kotlin/org/apache/isis/client/kroviz/core/aggregator/ObjectAggregator.kt
+++ b/incubator/clients/kroviz/src/main/kotlin/org/apache/isis/client/kroviz/core/aggregator/ObjectAggregator.kt
@@ -36,7 +36,11 @@ class ObjectAggregator(val actionTitle: String) : BaseAggregator() {
 
     fun handleObject(obj: TObject) {
         dsp.addData(obj)
-        obj.getLayoutLink()?.invokeWith(this)
+        val l = obj.getLayoutLink()!!
+        // Json.Layout is invoked first
+        l.invokeWith(this)
+        // then Xml.Layout is to be invoked as well
+        l.invokeWith(this, "xml")
     }
 
     fun handleResultObject(obj: ResultObject) {