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 2019/12/30 10:16:00 UTC
[syncope] branch master updated: Fixed label for validation message
This is an automated email from the ASF dual-hosted git repository.
mdisabatino pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/syncope.git
The following commit(s) were added to refs/heads/master by this push:
new ba66e38 Fixed label for validation message
ba66e38 is described below
commit ba66e38f4d39edb0ee46420533f627c48f2ba56e
Author: Marco Di Sabatino Di Diodoro <ma...@tirasa.net>
AuthorDate: Fri Dec 27 17:09:43 2019 +0100
Fixed label for validation message
---
.../syncope/client/ui/commons/markup/html/form/AjaxCheckBoxPanel.java | 3 ++-
.../client/ui/commons/markup/html/form/AjaxDateFieldPanel.java | 3 ++-
.../client/ui/commons/markup/html/form/AjaxDateTimeFieldPanel.java | 3 ++-
.../client/ui/commons/markup/html/form/AjaxDropDownChoicePanel.java | 4 ++--
.../client/console/wicket/markup/html/form/BinaryFieldPanel.java | 4 ++--
.../syncope/client/enduser/markup/html/form/BinaryFieldPanel.java | 4 ++--
6 files changed, 12 insertions(+), 9 deletions(-)
diff --git a/client/idrepo/common-ui/src/main/java/org/apache/syncope/client/ui/commons/markup/html/form/AjaxCheckBoxPanel.java b/client/idrepo/common-ui/src/main/java/org/apache/syncope/client/ui/commons/markup/html/form/AjaxCheckBoxPanel.java
index bb52e5b..0ec0bd0 100644
--- a/client/idrepo/common-ui/src/main/java/org/apache/syncope/client/ui/commons/markup/html/form/AjaxCheckBoxPanel.java
+++ b/client/idrepo/common-ui/src/main/java/org/apache/syncope/client/ui/commons/markup/html/form/AjaxCheckBoxPanel.java
@@ -30,6 +30,7 @@ import org.apache.wicket.markup.html.form.CheckBox;
import org.apache.wicket.markup.html.list.ListItem;
import org.apache.wicket.model.IModel;
import org.apache.wicket.model.Model;
+import org.apache.wicket.model.ResourceModel;
public class AjaxCheckBoxPanel extends FieldPanel<Boolean> {
@@ -44,7 +45,7 @@ public class AjaxCheckBoxPanel extends FieldPanel<Boolean> {
super(id, name, model);
field = new CheckBox("checkboxField", model);
- add(field.setLabel(new Model<>(name)).setOutputMarkupId(true));
+ add(field.setLabel(new ResourceModel(name, name)).setOutputMarkupId(true));
if (enableOnChange && !isReadOnly()) {
field.add(new IndicatorAjaxFormComponentUpdatingBehavior(Constants.ON_CHANGE) {
diff --git a/client/idrepo/common-ui/src/main/java/org/apache/syncope/client/ui/commons/markup/html/form/AjaxDateFieldPanel.java b/client/idrepo/common-ui/src/main/java/org/apache/syncope/client/ui/commons/markup/html/form/AjaxDateFieldPanel.java
index 779e6a8..ee9815d 100644
--- a/client/idrepo/common-ui/src/main/java/org/apache/syncope/client/ui/commons/markup/html/form/AjaxDateFieldPanel.java
+++ b/client/idrepo/common-ui/src/main/java/org/apache/syncope/client/ui/commons/markup/html/form/AjaxDateFieldPanel.java
@@ -23,6 +23,7 @@ import java.util.Date;
import org.apache.commons.lang3.time.FastDateFormat;
import org.apache.wicket.model.IModel;
import org.apache.wicket.model.Model;
+import org.apache.wicket.model.ResourceModel;
public class AjaxDateFieldPanel extends DateFieldPanel {
@@ -36,7 +37,7 @@ public class AjaxDateFieldPanel extends DateFieldPanel {
super(id, name, model, datePattern);
field = new AjaxDatePicker("field", model, getLocale(), datePattern.getPattern());
- add(field.setLabel(new Model<>(name)).setOutputMarkupId(true));
+ add(field.setLabel(new ResourceModel(name, name)).setOutputMarkupId(true));
}
@Override
diff --git a/client/idrepo/common-ui/src/main/java/org/apache/syncope/client/ui/commons/markup/html/form/AjaxDateTimeFieldPanel.java b/client/idrepo/common-ui/src/main/java/org/apache/syncope/client/ui/commons/markup/html/form/AjaxDateTimeFieldPanel.java
index 3fa8af4..cb1ddec 100644
--- a/client/idrepo/common-ui/src/main/java/org/apache/syncope/client/ui/commons/markup/html/form/AjaxDateTimeFieldPanel.java
+++ b/client/idrepo/common-ui/src/main/java/org/apache/syncope/client/ui/commons/markup/html/form/AjaxDateTimeFieldPanel.java
@@ -23,6 +23,7 @@ import java.util.Date;
import org.apache.commons.lang3.time.FastDateFormat;
import org.apache.wicket.model.IModel;
import org.apache.wicket.model.Model;
+import org.apache.wicket.model.ResourceModel;
public class AjaxDateTimeFieldPanel extends DateFieldPanel {
@@ -39,7 +40,7 @@ public class AjaxDateTimeFieldPanel extends DateFieldPanel {
// dateTimePattern should be spit into separate date and time pattern strings in order to be passed to the
// AjaxDateTimePicker constructor, but there is no safe way to do that - ignoring
field = new AjaxDateTimePicker("field", model, getLocale());
- add(field.setLabel(new Model<>(name)).setOutputMarkupId(true));
+ add(field.setLabel(new ResourceModel(name, name)).setOutputMarkupId(true));
}
@Override
diff --git a/client/idrepo/common-ui/src/main/java/org/apache/syncope/client/ui/commons/markup/html/form/AjaxDropDownChoicePanel.java b/client/idrepo/common-ui/src/main/java/org/apache/syncope/client/ui/commons/markup/html/form/AjaxDropDownChoicePanel.java
index 9d2325a..33e618f 100644
--- a/client/idrepo/common-ui/src/main/java/org/apache/syncope/client/ui/commons/markup/html/form/AjaxDropDownChoicePanel.java
+++ b/client/idrepo/common-ui/src/main/java/org/apache/syncope/client/ui/commons/markup/html/form/AjaxDropDownChoicePanel.java
@@ -28,7 +28,7 @@ import org.apache.wicket.markup.html.form.ChoiceRenderer;
import org.apache.wicket.markup.html.form.DropDownChoice;
import org.apache.wicket.markup.html.form.IChoiceRenderer;
import org.apache.wicket.model.IModel;
-import org.apache.wicket.model.Model;
+import org.apache.wicket.model.ResourceModel;
public class AjaxDropDownChoicePanel<T extends Serializable> extends FieldPanel<T> implements Cloneable {
@@ -44,7 +44,7 @@ public class AjaxDropDownChoicePanel<T extends Serializable> extends FieldPanel<
super(id, name, model);
field = new BootstrapSelect<>("dropDownChoiceField", model, List.of(), new ChoiceRenderer<>());
- add(field.setLabel(new Model<>(name)).setOutputMarkupId(true));
+ add(field.setLabel(new ResourceModel(name, name)).setOutputMarkupId(true));
if (enableOnBlur) {
field.add(new IndicatorAjaxFormComponentUpdatingBehavior(Constants.ON_BLUR) {
diff --git a/client/idrepo/console/src/main/java/org/apache/syncope/client/console/wicket/markup/html/form/BinaryFieldPanel.java b/client/idrepo/console/src/main/java/org/apache/syncope/client/console/wicket/markup/html/form/BinaryFieldPanel.java
index 3d2a0c2..1f83e1e 100644
--- a/client/idrepo/console/src/main/java/org/apache/syncope/client/console/wicket/markup/html/form/BinaryFieldPanel.java
+++ b/client/idrepo/console/src/main/java/org/apache/syncope/client/console/wicket/markup/html/form/BinaryFieldPanel.java
@@ -56,7 +56,7 @@ import org.apache.wicket.markup.html.form.TextField;
import org.apache.wicket.markup.html.form.upload.FileUpload;
import org.apache.wicket.markup.html.panel.Fragment;
import org.apache.wicket.model.IModel;
-import org.apache.wicket.model.Model;
+import org.apache.wicket.model.ResourceModel;
import org.apache.wicket.model.util.ListModel;
import org.apache.wicket.spring.injection.annot.SpringBean;
import org.apache.wicket.util.lang.Bytes;
@@ -145,7 +145,7 @@ public class BinaryFieldPanel extends BaseBinaryFieldPanel {
uploadForm.add(container);
field = new TextField<>("textField", model);
- add(field.setLabel(new Model<>(name)).setOutputMarkupId(true));
+ add(field.setLabel(new ResourceModel(name, name)).setOutputMarkupId(true));
uploadForm.add(new Label("preview", StringUtils.isBlank(mimeType) ? StringUtils.EMPTY : '(' + mimeType + ')'));
diff --git a/client/idrepo/enduser/src/main/java/org/apache/syncope/client/enduser/markup/html/form/BinaryFieldPanel.java b/client/idrepo/enduser/src/main/java/org/apache/syncope/client/enduser/markup/html/form/BinaryFieldPanel.java
index 79cd24a..cc6cffb 100644
--- a/client/idrepo/enduser/src/main/java/org/apache/syncope/client/enduser/markup/html/form/BinaryFieldPanel.java
+++ b/client/idrepo/enduser/src/main/java/org/apache/syncope/client/enduser/markup/html/form/BinaryFieldPanel.java
@@ -55,7 +55,7 @@ import org.apache.wicket.markup.html.form.TextField;
import org.apache.wicket.markup.html.form.upload.FileUpload;
import org.apache.wicket.markup.html.panel.Fragment;
import org.apache.wicket.model.IModel;
-import org.apache.wicket.model.Model;
+import org.apache.wicket.model.ResourceModel;
import org.apache.wicket.model.util.ListModel;
import org.apache.wicket.spring.injection.annot.SpringBean;
import org.apache.wicket.util.lang.Bytes;
@@ -143,7 +143,7 @@ public class BinaryFieldPanel extends BaseBinaryFieldPanel {
uploadForm.add(container);
field = new TextField<>("textField", model);
- add(field.setLabel(new Model<>(name)).setOutputMarkupId(true));
+ add(field.setLabel(new ResourceModel(name, name)).setOutputMarkupId(true));
uploadForm.add(new Label("preview", StringUtils.isBlank(mimeType) ? StringUtils.EMPTY : '(' + mimeType + ')'));