This is an automated email from the ASF dual-hosted git repository.
ilgrosso 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 fefda62 [SYNCOPE-1560] Possibly the last tweaks
fefda62 is described below
commit fefda624d44eeb2e50d390b16238804a241ded8c
Author: Francesco Chicchiriccò <[email protected]>
AuthorDate: Tue May 19 16:05:45 2020 +0200
[SYNCOPE-1560] Possibly the last tweaks
---
.../client/console/wicket/markup/html/form/BinaryFieldPanel.java | 8 +++-----
.../syncope/client/console/wizards/CSVPullWizardBuilder.java | 9 ++++-----
.../org/apache/syncope/client/console/panels/ImportMetadata.java | 8 ++++----
3 files changed, 11 insertions(+), 14 deletions(-)
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 47d7ed0..4ab4eff 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
@@ -174,23 +174,21 @@ public class BinaryFieldPanel extends FieldPanel<String> {
downloadLink.setOutputMarkupId(true);
uploadForm.add(downloadLink);
- ListModel<FileUpload> fileUploadModel = new ListModel<>(new
ArrayList<>());
FileInputConfig config = new FileInputConfig().
showUpload(false).showRemove(false).showPreview(false);
String language =
SyncopeConsoleSession.get().getLocale().getLanguage();
if (!Locale.ENGLISH.getLanguage().equals(language)) {
config.withLocale(language);
}
- fileUpload = new BootstrapFileInputField("fileUpload",
fileUploadModel, config);
+ fileUpload = new BootstrapFileInputField("fileUpload", new
ListModel<>(new ArrayList<>()), config);
fileUpload.add(new AjaxFormSubmitBehavior(Constants.ON_CHANGE) {
private static final long serialVersionUID = -1107858522700306810L;
@Override
protected void onSubmit(final AjaxRequestTarget target) {
- if (!fileUploadModel.getObject().isEmpty()) {
- FileUpload uploaded = fileUploadModel.getObject().get(0);
-
+ FileUpload uploaded = fileUpload.getFileUpload();
+ if (uploaded != null) {
if (maxUploadSize != null && uploaded.getSize() >
maxUploadSize.bytes()) {
// SYNCOPE-1213 manage directly max upload file size
(if set in properties file)
SyncopeConsoleSession.get().error(getString("tooLargeFile").
diff --git
a/client/console/src/main/java/org/apache/syncope/client/console/wizards/CSVPullWizardBuilder.java
b/client/console/src/main/java/org/apache/syncope/client/console/wizards/CSVPullWizardBuilder.java
index 98bf149..45e4745 100644
---
a/client/console/src/main/java/org/apache/syncope/client/console/wizards/CSVPullWizardBuilder.java
+++
b/client/console/src/main/java/org/apache/syncope/client/console/wizards/CSVPullWizardBuilder.java
@@ -132,23 +132,22 @@ public class CSVPullWizardBuilder extends
AjaxWizardBuilder<CSVPullSpec> {
private static final long serialVersionUID = -4736870165235853919L;
public Details(final CSVPullSpec spec) {
- ListModel<FileUpload> fileUploadModel = new ListModel<>(new
ArrayList<>());
FileInputConfig csvFile = new FileInputConfig().
showUpload(false).showRemove(false).showPreview(false);
String language =
SyncopeConsoleSession.get().getLocale().getLanguage();
if (!Locale.ENGLISH.getLanguage().equals(language)) {
csvFile.withLocale(language);
}
- BootstrapFileInputField csvUpload = new
BootstrapFileInputField("csvUpload", fileUploadModel, csvFile);
+ BootstrapFileInputField csvUpload =
+ new BootstrapFileInputField("csvUpload", new
ListModel<>(new ArrayList<>()), csvFile);
csvUpload.add(new AjaxFormSubmitBehavior(Constants.ON_CHANGE) {
private static final long serialVersionUID =
5538299138211283825L;
@Override
protected void onSubmit(final AjaxRequestTarget target) {
- if (!fileUploadModel.getObject().isEmpty()) {
- FileUpload uploadedFile =
fileUploadModel.getObject().get(0);
-
+ FileUpload uploadedFile = csvUpload.getFileUpload();
+ if (uploadedFile != null) {
if (maxUploadSize != null && uploadedFile.getSize() >
maxUploadSize.bytes()) {
SyncopeConsoleSession.get().error(getString("tooLargeFile").
replace("${maxUploadSizeB}",
String.valueOf(maxUploadSize.bytes())).
diff --git
a/ext/saml2sp/client-console/src/main/java/org/apache/syncope/client/console/panels/ImportMetadata.java
b/ext/saml2sp/client-console/src/main/java/org/apache/syncope/client/console/panels/ImportMetadata.java
index 856f269..e857892 100644
---
a/ext/saml2sp/client-console/src/main/java/org/apache/syncope/client/console/panels/ImportMetadata.java
+++
b/ext/saml2sp/client-console/src/main/java/org/apache/syncope/client/console/panels/ImportMetadata.java
@@ -47,14 +47,14 @@ public class ImportMetadata extends
TogglePanel<Serializable> {
Form<?> form = new Form<>("metadataForm");
addInnerObject(form);
- ListModel<FileUpload> fileUploadModel = new ListModel<>(new
ArrayList<>());
FileInputConfig config = new FileInputConfig().
showUpload(false).showRemove(false).showPreview(false);
String language =
SyncopeConsoleSession.get().getLocale().getLanguage();
if (!Locale.ENGLISH.getLanguage().equals(language)) {
config.withLocale(language);
}
- BootstrapFileInputField fileUpload = new
BootstrapFileInputField("fileUpload", fileUploadModel, config);
+ BootstrapFileInputField fileUpload =
+ new BootstrapFileInputField("fileUpload", new ListModel<>(new
ArrayList<>()), config);
form.add(fileUpload.setOutputMarkupId(true));
form.add(new AjaxSubmitLink("doUpload", form) {
@@ -63,8 +63,8 @@ public class ImportMetadata extends TogglePanel<Serializable>
{
@Override
protected void onSubmit(final AjaxRequestTarget target) {
- if (!fileUploadModel.getObject().isEmpty()) {
- FileUpload uploaded = fileUploadModel.getObject().get(0);
+ FileUpload uploaded = fileUpload.getFileUpload();
+ if (uploaded != null) {
try {
restClient.importIdPs(uploaded.getInputStream());
