You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@syncope.apache.org by md...@apache.org on 2021/05/18 09:28:53 UTC
[syncope] branch 2_1_X updated: [SYNCOPE-1633] Confirm dialog
custom message
This is an automated email from the ASF dual-hosted git repository.
mdisabatino pushed a commit to branch 2_1_X
in repository https://gitbox.apache.org/repos/asf/syncope.git
The following commit(s) were added to refs/heads/2_1_X by this push:
new 5d45175 [SYNCOPE-1633] Confirm dialog custom message
5d45175 is described below
commit 5d451759a2224b8d6fb608d62814e59b1a41ec5f
Author: Marco Di Sabatino Di Diodoro <ma...@tirasa.net>
AuthorDate: Tue May 18 11:28:37 2021 +0200
[SYNCOPE-1633] Confirm dialog custom message
---
.../org/apache/syncope/client/console/commons/Constants.java | 2 ++
.../client/console/wicket/markup/html/form/ActionLink.java | 11 +++++++++++
.../client/console/wicket/markup/html/form/ActionPanel.java | 6 +++++-
3 files changed, 18 insertions(+), 1 deletion(-)
diff --git a/client/console/src/main/java/org/apache/syncope/client/console/commons/Constants.java b/client/console/src/main/java/org/apache/syncope/client/console/commons/Constants.java
index 1b46767..69579df 100644
--- a/client/console/src/main/java/org/apache/syncope/client/console/commons/Constants.java
+++ b/client/console/src/main/java/org/apache/syncope/client/console/commons/Constants.java
@@ -80,6 +80,8 @@ public final class Constants {
public static final String OUTER = "outer";
public static final String ACTION = "action";
+
+ public static final String CONFIRM_DELETE = "confirmDelete";
public static final String BEFORE_LOGOUT_PAGE = "beforeLogoutPage";
diff --git a/client/console/src/main/java/org/apache/syncope/client/console/wicket/markup/html/form/ActionLink.java b/client/console/src/main/java/org/apache/syncope/client/console/wicket/markup/html/form/ActionLink.java
index 306bbf3..3854929 100644
--- a/client/console/src/main/java/org/apache/syncope/client/console/wicket/markup/html/form/ActionLink.java
+++ b/client/console/src/main/java/org/apache/syncope/client/console/wicket/markup/html/form/ActionLink.java
@@ -33,6 +33,8 @@ public abstract class ActionLink<T extends Serializable> implements Serializable
private boolean enabled = true;
+ private String confirmMessage;
+
public ActionLink() {
}
@@ -160,4 +162,13 @@ public abstract class ActionLink<T extends Serializable> implements Serializable
public boolean isIndicatorEnabled() {
return true;
}
+
+ public String getConfirmMessage() {
+ return confirmMessage;
+ }
+
+ public ActionLink<T> confirmMessage(final String confirmMessage) {
+ this.confirmMessage = confirmMessage;
+ return this;
+ }
}
diff --git a/client/console/src/main/java/org/apache/syncope/client/console/wicket/markup/html/form/ActionPanel.java b/client/console/src/main/java/org/apache/syncope/client/console/wicket/markup/html/form/ActionPanel.java
index e58789c..933bff2 100644
--- a/client/console/src/main/java/org/apache/syncope/client/console/wicket/markup/html/form/ActionPanel.java
+++ b/client/console/src/main/java/org/apache/syncope/client/console/wicket/markup/html/form/ActionPanel.java
@@ -96,7 +96,11 @@ public final class ActionPanel<T extends Serializable> extends Panel {
enabled = action.getLink().isEnabled(obj);
actionLink = action.isOnConfirm()
- ? new IndicatingOnConfirmAjaxLink<Void>(Constants.ACTION, enabled) {
+ ? new IndicatingOnConfirmAjaxLink<Void>(
+ Constants.ACTION,
+ StringUtils.isNotBlank(action.getLink().getConfirmMessage())
+ ? action.getLink().getConfirmMessage()
+ : Constants.CONFIRM_DELETE, enabled) {
private static final long serialVersionUID = -7978723352517770644L;