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 2019/01/08 07:25:55 UTC
[isis] 05/10: ISIS-2078: handles service actions (ie menu items)
gracefully if there promptStyle is set to INLINE or INLINE_AS_IF_EDIT
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
commit 0d0a4a7cc38e9ca95e48667cdb1ae76949b70819
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Tue Jan 8 06:57:33 2019 +0000
ISIS-2078: handles service actions (ie menu items) gracefully if there promptStyle is set to INLINE or INLINE_AS_IF_EDIT
---
.../java/org/apache/isis/viewer/wicket/ui/pages/PageAbstract.java | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/PageAbstract.java b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/PageAbstract.java
index f85f291..ffef9e0 100644
--- a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/PageAbstract.java
+++ b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/PageAbstract.java
@@ -469,6 +469,9 @@ public abstract class PageAbstract extends WebPage implements ActionPromptProvid
switch (promptStyle) {
case AS_CONFIGURED:
case DIALOG:
+ case INLINE:
+ case INLINE_AS_IF_EDIT:
+ default:
final DialogMode dialogMode = CONFIG_DIALOG_MODE.from(getConfiguration());
switch (dialogMode) {
case SIDEBAR:
@@ -481,10 +484,6 @@ public abstract class PageAbstract extends WebPage implements ActionPromptProvid
return actionPromptSidebar;
case DIALOG_MODAL:
return actionPromptModalWindow;
- case INLINE:
- case INLINE_AS_IF_EDIT:
- default:
- throw new IllegalArgumentException(String.format("PromptStyle '%s' not supported", promptStyle));
}
}