You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by da...@apache.org on 2021/06/29 05:56:06 UTC
[isis] 01/10: ISIS-2619: partially revert,
show the logicalTypeName for view models.
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a commit to branch ISIS-2779
in repository https://gitbox.apache.org/repos/asf/isis.git
commit 95746c2f886ac54659b9681acc4b6573803d03d4
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Mon Jun 28 19:42:31 2021 +0100
ISIS-2619: partially revert, show the logicalTypeName for view models.
Otherwise metadata tabgroup collapses to nothing and we can't see any of the contributed actions on the metadata panel.
(cherry picked from commit 093e81d72fcfea911faaff84f5e9e248706cdfa8)
---
.../apache/isis/applib/mixins/metamodel/Object_logicalTypeName.java | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/api/applib/src/main/java/org/apache/isis/applib/mixins/metamodel/Object_logicalTypeName.java b/api/applib/src/main/java/org/apache/isis/applib/mixins/metamodel/Object_logicalTypeName.java
index c687726..e75db1d 100644
--- a/api/applib/src/main/java/org/apache/isis/applib/mixins/metamodel/Object_logicalTypeName.java
+++ b/api/applib/src/main/java/org/apache/isis/applib/mixins/metamodel/Object_logicalTypeName.java
@@ -28,6 +28,7 @@ import org.apache.isis.applib.annotation.PropertyLayout;
import org.apache.isis.applib.annotation.Where;
import org.apache.isis.applib.mixins.layout.LayoutMixinConstants;
import org.apache.isis.applib.services.bookmark.BookmarkService;
+import org.apache.isis.applib.services.metamodel.BeanSort;
import org.apache.isis.applib.services.metamodel.MetaModelService;
import lombok.RequiredArgsConstructor;
@@ -78,7 +79,8 @@ public class Object_logicalTypeName {
@MemberSupport public boolean hideProp() {
val bookmark = bookmarkService.bookmarkForElseFail(this.holder);
- return !metaModelService.sortOf(bookmark, MetaModelService.Mode.RELAXED).isEntity();
+ val beanSort = metaModelService.sortOf(bookmark, MetaModelService.Mode.RELAXED);
+ return !beanSort.isEntity() && !beanSort.isViewModel();
}
}