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 2020/01/26 17:42:21 UTC
[isis] branch master updated: ISIS-2272: fixes home page support if
there is no home page
This is an automated email from the ASF dual-hosted git repository.
danhaywood 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 e89bdf6 ISIS-2272: fixes home page support if there is no home page
e89bdf6 is described below
commit e89bdf6c2485ec80bef3c7c6b91ec52a20d8015c
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Sun Jan 26 17:38:57 2020 +0000
ISIS-2272: fixes home page support if there is no home page
---
starters/adoc/modules/ROOT/nav.adoc | 2 --
starters/adoc/modules/simpleapp/nav.adoc | 2 +-
.../org/apache/isis/viewer/wicket/ui/pages/home/HomePage.java | 10 +++++++++-
3 files changed, 10 insertions(+), 4 deletions(-)
diff --git a/starters/adoc/modules/ROOT/nav.adoc b/starters/adoc/modules/ROOT/nav.adoc
index 0170b3e..579c69c 100644
--- a/starters/adoc/modules/ROOT/nav.adoc
+++ b/starters/adoc/modules/ROOT/nav.adoc
@@ -1,5 +1,3 @@
-* xref:about.adoc[Starter Apps]
-
* xref:about.adoc[Starter Parent]
diff --git a/starters/adoc/modules/simpleapp/nav.adoc b/starters/adoc/modules/simpleapp/nav.adoc
index f613038..f63c990 100644
--- a/starters/adoc/modules/simpleapp/nav.adoc
+++ b/starters/adoc/modules/simpleapp/nav.adoc
@@ -1,2 +1,2 @@
-* xref:about.adoc[Simple App]
+* xref:about.adoc[SimpleApp]
diff --git a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/home/HomePage.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/home/HomePage.java
index 8331b4c..3038f1a 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/home/HomePage.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/home/HomePage.java
@@ -19,11 +19,15 @@
package org.apache.isis.viewer.wicket.ui.pages.home;
+import java.util.function.Supplier;
+
import org.apache.wicket.authroles.authorization.strategies.role.annotations.AuthorizeInstantiation;
import org.apache.wicket.request.cycle.RequestCycle;
import org.apache.wicket.request.mapper.parameter.PageParameters;
import org.apache.isis.applib.services.message.MessageService;
+import org.apache.isis.core.metamodel.spec.ManagedObject;
+import org.apache.isis.core.runtime.context.session.RuntimeContextBase;
import org.apache.isis.core.runtime.session.IsisSession;
import org.apache.isis.viewer.wicket.model.models.ActionModel;
import org.apache.isis.viewer.wicket.model.models.EntityModel;
@@ -62,7 +66,11 @@ public class HomePage extends PageAbstract {
.informUser("Page timeout");
}
- val homePageAdapter = IsisSession.current().map(x -> x.getHomePageSupplier().get()).orElse(null);
+ val homePageAdapter = IsisSession.current()
+ .map(RuntimeContextBase::getHomePageSupplier)
+ .map(Supplier::get)
+ .filter(x -> x != ManagedObject.empty())
+ .orElse(null);
if(homePageAdapter != null) {
final RequestCycle requestCycle = RequestCycle.get();