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/06/07 08:16:26 UTC

[isis] branch master updated: ISIS-2631: fixes wrong demo menu layout id

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 81a7895  ISIS-2631: fixes wrong demo menu layout id
81a7895 is described below

commit 81a78957c0b27db38c0d0333bed830517c15875f
Author: Andi Huber <ah...@apache.org>
AuthorDate: Mon Jun 7 10:16:11 2021 +0200

    ISIS-2631: fixes wrong demo menu layout id
---
 examples/demo/domain/src/main/java/demoapp/dom/menubars.layout.xml    | 2 +-
 .../isis/viewer/common/model/menu/MenuUiModel_buildMenuItems.java     | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/examples/demo/domain/src/main/java/demoapp/dom/menubars.layout.xml b/examples/demo/domain/src/main/java/demoapp/dom/menubars.layout.xml
index 194556c..b6760a3 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/menubars.layout.xml
+++ b/examples/demo/domain/src/main/java/demoapp/dom/menubars.layout.xml
@@ -33,7 +33,7 @@ For latest we use: https://raw.githubusercontent.com/apache/isis/master/antora/s
                 <mb3:serviceAction objectType="demo.DomainObjectMenu" id="mixinMethod"/>
                 <mb3:serviceAction objectType="demo.DomainObjectMenu" id="natureStateful"/>
                 <mb3:serviceAction objectType="demo.DomainObjectMenu" id="natureStatefulRefsEntity"/>
-                <mb3:serviceAction objectType="demo.DomainObjectMenu" id="objectType"/>
+                <mb3:serviceAction objectType="demo.DomainObjectMenu" id="logicalTypeName"/>
                 <mb3:serviceAction objectType="demo.DomainObjectMenu" id="xxxDomainEvent"/>
                 <mb3:serviceAction objectType="demo.DomainObjectMenu" id="xxxLifecycleEvent"/>
             </mb3:section>
diff --git a/viewers/common/src/main/java/org/apache/isis/viewer/common/model/menu/MenuUiModel_buildMenuItems.java b/viewers/common/src/main/java/org/apache/isis/viewer/common/model/menu/MenuUiModel_buildMenuItems.java
index 9625aa6..2ffc4e7 100644
--- a/viewers/common/src/main/java/org/apache/isis/viewer/common/model/menu/MenuUiModel_buildMenuItems.java
+++ b/viewers/common/src/main/java/org/apache/isis/viewer/common/model/menu/MenuUiModel_buildMenuItems.java
@@ -68,7 +68,9 @@ final class MenuUiModel_buildMenuItems {
                             .lookupAction(serviceAdapter, actionLayoutData.getId(), Where.EVERYWHERE)
                             .orElse(null);
                     if (managedAction == null) {
-                        log.warn("No such action {}", actionLayoutData.getId());
+                        log.warn("No such action: bean-name '{}' action-id '{}'",
+                                serviceBeanName,
+                                actionLayoutData.getId());
                         continue;
                     }