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 2020/02/13 13:07:32 UTC
[isis] 02/02: ISIS-2275: supposed fix
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
commit f7c564571f2be79bd40fa40e52946f45d9b01b6e
Author: Andi Huber <ah...@apache.org>
AuthorDate: Thu Feb 13 14:07:20 2020 +0100
ISIS-2275: supposed fix
---
.../org/apache/isis/core/metamodel/layout/LayoutFacetUtil.java | 4 +++-
.../metamodel/services/grid/bootstrap3/GridSystemServiceBS3.java | 8 ++++++--
2 files changed, 9 insertions(+), 3 deletions(-)
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/layout/LayoutFacetUtil.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/layout/LayoutFacetUtil.java
index c3a73f4..c3f7f08 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/layout/LayoutFacetUtil.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/layout/LayoutFacetUtil.java
@@ -120,10 +120,12 @@ public class LayoutFacetUtil {
val defaultViewFacet = facetHolder.getFacet(DefaultViewFacet.class);
if(isDoOp(defaultViewFacet)) {
final String defaultView = defaultViewFacet.value();
- if(!_Strings.isNullOrEmpty(defaultView)) {
+ if(_Strings.isNotEmpty(defaultView)) {
collectionLayoutData.setDefaultView(defaultView);
+ return;
}
}
+ collectionLayoutData.setDefaultView("table");
}
public void setDescribedAsIfAny(
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/grid/bootstrap3/GridSystemServiceBS3.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/grid/bootstrap3/GridSystemServiceBS3.java
index e652033..af72789 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/grid/bootstrap3/GridSystemServiceBS3.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/grid/bootstrap3/GridSystemServiceBS3.java
@@ -59,6 +59,7 @@ import org.apache.isis.core.commons.internal.resources._Resources;
import org.apache.isis.core.metamodel.facets.actions.position.ActionPositionFacet;
import org.apache.isis.core.metamodel.facets.members.order.MemberOrderFacet;
import org.apache.isis.core.metamodel.facets.members.order.annotprop.MemberOrderFacetAnnotation;
+import org.apache.isis.core.metamodel.layout.LayoutFacetUtil.MetamodelToGridOverridingVisitor;
import org.apache.isis.core.metamodel.services.grid.GridReaderUsingJaxb;
import org.apache.isis.core.metamodel.services.grid.GridSystemServiceAbstract;
import org.apache.isis.core.metamodel.spec.ObjectSpecification;
@@ -408,6 +409,9 @@ public class GridSystemServiceBS3 extends GridSystemServiceAbstract<BS3Grid> {
}
}
+ // prime all layout data from metamodel
+ grid.visit(MetamodelToGridOverridingVisitor.of(objectSpec));
+
return true;
}
@@ -439,7 +443,7 @@ public class GridSystemServiceBS3 extends GridSystemServiceAbstract<BS3Grid> {
for (final String collectionId : collectionIds) {
val collectionLayoutData = new CollectionLayoutData(collectionId);
- collectionLayoutData.setDefaultView("table");
+ //collectionLayoutData.setDefaultView("table"); redundant, done later with MetamodelToGridOverridingVisitor
tabRowCol.getCollections().add(collectionLayoutData);
onNewLayoutData.accept(collectionId, collectionLayoutData);
}
@@ -467,7 +471,7 @@ public class GridSystemServiceBS3 extends GridSystemServiceAbstract<BS3Grid> {
tabRow.getCols().add(tabRowCol);
final CollectionLayoutData layoutMetadata = new CollectionLayoutData(collectionId);
- layoutMetadata.setDefaultView("table");
+ //collectionLayoutData.setDefaultView("table"); redundant, done later with MetamodelToGridOverridingVisitor
tabRowCol.getCollections().add(layoutMetadata);
}
}