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 2018/09/06 16:05:23 UTC
[isis] branch master updated: ISIS-1934: fixes Action Confirmation
Dialog does not escape menu boundaries
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 0ae1dca ISIS-1934: fixes Action Confirmation Dialog does not escape menu boundaries
0ae1dca is described below
commit 0ae1dca57f5d1a876e92d594c83ae77d928a0f63
Author: Andi Huber <ah...@apache.org>
AuthorDate: Thu Sep 6 18:05:10 2018 +0200
ISIS-1934: fixes Action Confirmation Dialog does not escape menu
boundaries
also bumps wicket-bootstrap version 2.0.1 -> 2.0.2
Task-Url: https://issues.apache.org/jira/browse/ISIS-1934
---
core/pom.xml | 2 +-
.../ui/components/actionmenu/serviceactions/ServiceActionUtil.java | 2 +-
.../ui/components/actionmenu/serviceactions/ServiceActionsPanel.html | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/core/pom.xml b/core/pom.xml
index 0169a96..842fb5a 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -153,7 +153,7 @@
<wicket.version>8.0.0</wicket.version>
<wicketstuff.version>8.0.0</wicketstuff.version>
- <wicket-bootstrap.version>2.0.1</wicket-bootstrap.version>
+ <wicket-bootstrap.version>2.0.2</wicket-bootstrap.version>
<wicket-source.version>7.0.0</wicket-source.version>
<!-- [ahuber] update to newer versions just does not work as a drop in replacement
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionmenu/serviceactions/ServiceActionUtil.java b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionmenu/serviceactions/ServiceActionUtil.java
index bf34512..643829e 100644
--- a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionmenu/serviceactions/ServiceActionUtil.java
+++ b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionmenu/serviceactions/ServiceActionUtil.java
@@ -297,7 +297,7 @@ public final class ServiceActionUtil {
.withPlacement(TooltipConfig.Placement.bottom)
.withBtnOkClass("btn btn-danger")
.withBtnCancelClass("btn btn-default");
-
+
component.add(new ConfirmationBehavior(null, confirmationConfig));
}
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionmenu/serviceactions/ServiceActionsPanel.html b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionmenu/serviceactions/ServiceActionsPanel.html
index f80ca9c..e772903 100644
--- a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionmenu/serviceactions/ServiceActionsPanel.html
+++ b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionmenu/serviceactions/ServiceActionsPanel.html
@@ -23,7 +23,7 @@
<wicket:panel>
<li class="dropdown" wicket:id="menuItems">
<a tabindex="-1" href="javascript:;" class="dropdown-toggle" data-toggle="dropdown"><span wicket:id="name"></span> <span class="caret"></span></a>
- <ul wicket:id="topMenu" class="dropdown-menu scrollable-menu multi-level" role="menu">
+ <ul wicket:id="topMenu" class="dropdown-menu multi-level" role="menu">
<li wicket:id="subMenuItems">
<wicket:container wicket:id="content"></wicket:container>
</li>