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 2015/10/06 23:29:35 UTC
[2/4] isis git commit: ISIS-1007 Upgrade Wicket-Bootstrap to 0.9.12
and Wicket Webjars to 0.4.7
ISIS-1007 Upgrade Wicket-Bootstrap to 0.9.12 and Wicket Webjars to 0.4.7
Add code showing how to configure the confirmation dialog
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/2104d743
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/2104d743
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/2104d743
Branch: refs/heads/master
Commit: 2104d743e2440211d28dfb5246bb6cc7fbe53bec
Parents: f5f0fc6
Author: Martin Tzvetanov Grigorov <mg...@apache.org>
Authored: Thu Aug 13 14:28:00 2015 +0300
Committer: Martin Tzvetanov Grigorov <mg...@apache.org>
Committed: Thu Aug 13 14:28:00 2015 +0300
----------------------------------------------------------------------
core/pom.xml | 4 ++--
.../ui/components/actions/ActionParametersFormPanel.java | 10 +++++++++-
2 files changed, 11 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/2104d743/core/pom.xml
----------------------------------------------------------------------
diff --git a/core/pom.xml b/core/pom.xml
index dfcabcd..b8bd3ab 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -134,8 +134,8 @@
<wicket.version>6.20.0</wicket.version>
<wicketstuff.version>6.20.0</wicketstuff.version>
- <wicket-webjars.version>0.4.6</wicket-webjars.version>
- <wicket-bootstrap.version>0.9.12-SNAPSHOT</wicket-bootstrap.version>
+ <wicket-webjars.version>0.4.7</wicket-webjars.version>
+ <wicket-bootstrap.version>0.9.12</wicket-bootstrap.version>
<wicket-source.version>6.0.0.8</wicket-source.version>
<wicket-select2.version>2.2.3</wicket-select2.version>
http://git-wip-us.apache.org/repos/asf/isis/blob/2104d743/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actions/ActionParametersFormPanel.java
----------------------------------------------------------------------
diff --git a/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actions/ActionParametersFormPanel.java b/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actions/ActionParametersFormPanel.java
index 626c5f8..f20fbe7 100644
--- a/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actions/ActionParametersFormPanel.java
+++ b/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actions/ActionParametersFormPanel.java
@@ -20,6 +20,7 @@
package org.apache.isis.viewer.wicket.ui.components.actions;
import de.agilecoders.wicket.extensions.markup.html.bootstrap.confirmation.ConfirmationBehavior;
+import de.agilecoders.wicket.extensions.markup.html.bootstrap.confirmation.ConfirmationConfig;
import java.util.List;
import com.google.common.collect.Lists;
@@ -219,7 +220,14 @@ public class ActionParametersFormPanel extends PanelAbstract<ActionModel> {
final ObjectAction action = actionModel.getActionMemento().getAction();
ActionSemantics.Of semantics = action.getSemantics();
if (semantics == ActionSemantics.Of.IDEMPOTENT_ARE_YOU_SURE || semantics == ActionSemantics.Of.NON_IDEMPOTENT_ARE_YOU_SURE) {
- button.add(new ConfirmationBehavior());
+ ConfirmationConfig confirmationConfig = new ConfirmationConfig();
+ // TODO ISIS-1007 Use i18n for the title and the labels
+ confirmationConfig.withTitle("Are you sure?");
+ confirmationConfig.withBtnOkLabel("Confirm");
+ confirmationConfig.withBtnCancelLabel("Cancel");
+ confirmationConfig.withBtnOkClass("btn btn-danger");
+ confirmationConfig.withBtnCancelClass("btn btn-default");
+ button.add(new ConfirmationBehavior(confirmationConfig));
}
}