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 2022/06/14 08:21:11 UTC
[isis] branch master updated: Various fixes to error page rendering
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 a71e5cce48 Various fixes to error page rendering
new fa90c7d49b Merge pull request #981 from mwhesse/ISIS-3076
a71e5cce48 is described below
commit a71e5cce48c276822862f6d0cd590bfdddc9db44
Author: mwhesse <mw...@gmail.com>
AuthorDate: Tue Jun 14 00:16:05 2022 +0700
Various fixes to error page rendering
---
.../demo/domain/src/main/resources/static/css/application.css | 4 ----
.../viewer/wicket/ui/errors/ExceptionStackTracePanel.html | 2 +-
.../viewer/wicket/ui/errors/ExceptionStackTracePanel.java | 3 ++-
.../org/apache/isis/viewer/wicket/ui/pages/home/HomePage.java | 11 ++---------
4 files changed, 5 insertions(+), 15 deletions(-)
diff --git a/examples/demo/domain/src/main/resources/static/css/application.css b/examples/demo/domain/src/main/resources/static/css/application.css
index 39c158c9af..5b240c9798 100644
--- a/examples/demo/domain/src/main/resources/static/css/application.css
+++ b/examples/demo/domain/src/main/resources/static/css/application.css
@@ -255,10 +255,6 @@ table.tableblock.grid-all td.tableblock {
padding: 5px;
}
-div.exceptionStackTracePanel div.errorInfo h2.mainMessage {
- margin-left: -32px;
-}
-
div.listingblock div.title {
font-style: italic;
color: darkred;
diff --git a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/errors/ExceptionStackTracePanel.html b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/errors/ExceptionStackTracePanel.html
index de968722f0..8574b9dd73 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/errors/ExceptionStackTracePanel.html
+++ b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/errors/ExceptionStackTracePanel.html
@@ -36,7 +36,7 @@
<div class="card-body" wicket:id="ticketMarkup">[ticket details]</div>
<div class="card-body">
<div class="form-group">
- <button type="submit" wicket:id="continueButton" class="btn btn-primary">Continue</button>
+ <a wicket:id="continueButton" class="btn btn-primary">Continue</a>
</div>
</div>
</div>
diff --git a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/errors/ExceptionStackTracePanel.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/errors/ExceptionStackTracePanel.java
index eef7308b7f..d31fcde73e 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/errors/ExceptionStackTracePanel.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/errors/ExceptionStackTracePanel.java
@@ -129,9 +129,10 @@ public class ExceptionStackTracePanel extends Panel {
pageClass = pageClassRegistry.getPageClass(PageType.ENTITY);
pageParameters = entityModel.getPageParameters();
} else {
+ pageClass = pageClassRegistry.getPageClass(PageType.HOME);
pageParameters = null;
- pageClass = HomePage.class;
}
+
final AbstractLink link = WktLinks.newBookmarkablePageLink("continueButton", pageParameters, pageClass);
add(link);
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 c2f215d9c0..435164a544 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
@@ -61,15 +61,8 @@ public class HomePage extends PageAbstract {
if(ManagedObjects.isSpecified(homePageAdapter)) {
val requestCycle = RequestCycle.get();
- try {
- val page = EntityPage.forAdapter(getCommonContext(), homePageAdapter);
- requestCycle.setResponsePage(page);
- } catch (Exception ignore) {
- // fallback (eg if permissions problem)
- WktComponents.permanentlyHide(themeDiv, ComponentType.ACTION_PROMPT);
- getComponentFactoryRegistry().addOrReplaceComponent(themeDiv, ComponentType.WELCOME, null);
- }
-
+ val page = EntityPage.forAdapter(getCommonContext(), homePageAdapter);
+ requestCycle.setResponsePage(page);
} else {
WktComponents.permanentlyHide(themeDiv, ComponentType.ACTION_PROMPT);
getComponentFactoryRegistry().addOrReplaceComponent(themeDiv, ComponentType.WELCOME, null);