This is an automated email from the ASF dual-hosted git repository.
mdisabatino pushed a commit to branch 2_0_X
in repository https://gitbox.apache.org/repos/asf/syncope.git
The following commit(s) were added to refs/heads/2_0_X by this push:
new f2d8e1e Fixed label for validation message
f2d8e1e is described below
commit f2d8e1e0501306860c2b2c04b5dee2996991c554
Author: Marco Di Sabatino Di Diodoro <marco.disabat...@tirasa.net>
AuthorDate: Fri Dec 27 17:09:43 2019 +0100
Fixed label for validation message
---
.../client/console/wicket/markup/html/form/AjaxCheckBoxPanel.java | 3 ++-
.../client/console/wicket/markup/html/form/AjaxDateFieldPanel.java | 3 ++-
.../console/wicket/markup/html/form/AjaxDateTimeFieldPanel.java | 3 ++-
.../console/wicket/markup/html/form/AjaxDropDownChoicePanel.java | 4 ++--
.../client/console/wicket/markup/html/form/BinaryFieldPanel.java | 4 ++--
5 files changed, 10 insertions(+), 7 deletions(-)
diff --git
a/client/console/src/main/java/org/apache/syncope/client/console/wicket/markup/html/form/AjaxCheckBoxPanel.java
b/client/console/src/main/java/org/apache/syncope/client/console/wicket/markup/html/form/AjaxCheckBoxPanel.java
index 56bd9d9..7727de2 100644
---
a/client/console/src/main/java/org/apache/syncope/client/console/wicket/markup/html/form/AjaxCheckBoxPanel.java
+++
b/client/console/src/main/java/org/apache/syncope/client/console/wicket/markup/html/form/AjaxCheckBoxPanel.java
@@ -29,6 +29,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> {
@@ -43,7 +44,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/console/src/main/java/org/apache/syncope/client/console/wicket/markup/html/form/AjaxDateFieldPanel.java
b/client/console/src/main/java/org/apache/syncope/client/console/wicket/markup/html/form/AjaxDateFieldPanel.java
index 78a28fd..4dc9d78 100644
---
a/client/console/src/main/java/org/apache/syncope/client/console/wicket/markup/html/form/AjaxDateFieldPanel.java
+++
b/client/console/src/main/java/org/apache/syncope/client/console/wicket/markup/html/form/AjaxDateFieldPanel.java
@@ -23,6 +23,7 @@ import java.util.Date;
import org.apache.syncope.client.console.SyncopeConsoleSession;
import org.apache.wicket.model.IModel;
import org.apache.wicket.model.Model;
+import org.apache.wicket.model.ResourceModel;
public class AjaxDateFieldPanel extends DateFieldPanel {
@@ -32,7 +33,7 @@ public class AjaxDateFieldPanel extends DateFieldPanel {
super(id, name, model, datePattern);
field = new AjaxDatePicker("field", model,
SyncopeConsoleSession.get().getLocale(), datePattern);
- add(field.setLabel(new Model<>(name)).setOutputMarkupId(true));
+ add(field.setLabel(new ResourceModel(name,
name)).setOutputMarkupId(true));
}
@Override
diff --git
a/client/console/src/main/java/org/apache/syncope/client/console/wicket/markup/html/form/AjaxDateTimeFieldPanel.java
b/client/console/src/main/java/org/apache/syncope/client/console/wicket/markup/html/form/AjaxDateTimeFieldPanel.java
index f4ad09e..f4aa186 100644
---
a/client/console/src/main/java/org/apache/syncope/client/console/wicket/markup/html/form/AjaxDateTimeFieldPanel.java
+++
b/client/console/src/main/java/org/apache/syncope/client/console/wicket/markup/html/form/AjaxDateTimeFieldPanel.java
@@ -23,6 +23,7 @@ import java.util.Date;
import org.apache.syncope.client.console.SyncopeConsoleSession;
import org.apache.wicket.model.IModel;
import org.apache.wicket.model.Model;
+import org.apache.wicket.model.ResourceModel;
public class AjaxDateTimeFieldPanel extends DateFieldPanel {
@@ -36,7 +37,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,
SyncopeConsoleSession.get().getLocale());
- add(field.setLabel(new Model<>(name)).setOutputMarkupId(true));
+ add(field.setLabel(new ResourceModel(name,
name)).setOutputMarkupId(true));
}
@Override
diff --git
a/client/console/src/main/java/org/apache/syncope/client/console/wicket/markup/html/form/AjaxDropDownChoicePanel.java
b/client/console/src/main/java/org/apache/syncope/client/console/wicket/markup/html/form/AjaxDropDownChoicePanel.java
index 193c0ad..7bf1cb7 100644
---
a/client/console/src/main/java/org/apache/syncope/client/console/wicket/markup/html/form/AjaxDropDownChoicePanel.java
+++
b/client/console/src/main/java/org/apache/syncope/client/console/wicket/markup/html/form/AjaxDropDownChoicePanel.java
@@ -29,7 +29,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 {
@@ -46,7 +46,7 @@ public class AjaxDropDownChoicePanel<T extends Serializable>
extends FieldPanel<
field = new BootstrapSelect<>(
"dropDownChoiceField", model, Collections.<T>emptyList(), 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/console/src/main/java/org/apache/syncope/client/console/wicket/markup/html/form/BinaryFieldPanel.java
b/client/console/src/main/java/org/apache/syncope/client/console/wicket/markup/html/form/BinaryFieldPanel.java
index 883454e..87e6b8a 100644
---
a/client/console/src/main/java/org/apache/syncope/client/console/wicket/markup/html/form/BinaryFieldPanel.java
+++
b/client/console/src/main/java/org/apache/syncope/client/console/wicket/markup/html/form/BinaryFieldPanel.java
@@ -54,7 +54,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.util.crypt.Base64;
import org.apache.wicket.util.lang.Bytes;
@@ -141,7 +141,7 @@ public class BinaryFieldPanel extends FieldPanel<String> {
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 + ")"));
