You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openmeetings.apache.org by so...@apache.org on 2019/10/30 16:08:48 UTC
[openmeetings] branch master updated: [OPENMEETINGS-2130] success
is reported after backup import
This is an automated email from the ASF dual-hosted git repository.
solomax pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/openmeetings.git
The following commit(s) were added to refs/heads/master by this push:
new 6bbc51a [OPENMEETINGS-2130] success is reported after backup import
6bbc51a is described below
commit 6bbc51ab54743cb2aff062a9b523acfcb962aaec
Author: Maxim Solodovnik <so...@gmail.com>
AuthorDate: Wed Oct 30 23:08:07 2019 +0700
[OPENMEETINGS-2130] success is reported after backup import
---
.../apache/openmeetings/web/admin/backup/BackupPanel.java | 15 +++++++--------
.../openmeetings/web/pages/install/InstallWizard.java | 2 +-
2 files changed, 8 insertions(+), 9 deletions(-)
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/backup/BackupPanel.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/backup/BackupPanel.java
index 701e4c1..1920cff 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/backup/BackupPanel.java
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/backup/BackupPanel.java
@@ -80,10 +80,10 @@ public class BackupPanel extends AdminBasePanel {
*/
private class BackupForm extends Form<Void> {
private static final long serialVersionUID = 1L;
- private final FileUploadField fileUploadField;
private final Model<Boolean> includeFilesInBackup = Model.of(true);
- private final AbstractAjaxTimerBehavior timer;
- private final ProgressBar progressBar;
+ private FileUploadField fileUploadField;
+ private AbstractAjaxTimerBehavior timer;
+ private ProgressBar progressBar;
private File backupFile;
private Throwable th = null;
private boolean started = false;
@@ -91,10 +91,12 @@ public class BackupPanel extends AdminBasePanel {
public BackupForm(String id) {
super(id);
-
// set this form to multipart mode (allways needed for uploads!)
setMultiPart(true);
+ }
+ @Override
+ protected void onInitialize() {
// set max upload size in form as info text
Long maxBytes = getMaxUploadSize();
double megaBytes = maxBytes.doubleValue() / 1024 / 1024;
@@ -198,6 +200,7 @@ public class BackupPanel extends AdminBasePanel {
return;
}
backupImport.performImport(upload.getInputStream());
+ feedback.success(getString("387") + " - " + getString("54"));
} catch (Exception e) {
log.error("Exception on panel backup upload ", e);
feedback.error(e);
@@ -212,10 +215,6 @@ public class BackupPanel extends AdminBasePanel {
target.add(feedback);
}
}));
- }
-
- @Override
- protected void onInitialize() {
add(new Label("cmdLineDesc", getString("1505")).setEscapeModelStrings(false));
super.onInitialize();
}
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/install/InstallWizard.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/install/InstallWizard.java
index d32e121..41be11a 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/install/InstallWizard.java
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/install/InstallWizard.java
@@ -542,7 +542,7 @@ public class InstallWizard extends AbstractWizard<InstallationConfig> {
}
private void reportSuccess(TextField<String> path) {
- path.success(path.getLabel().getObject() + " " + getString("54"));
+ path.success(path.getLabel().getObject() + " - " + getString("54"));
}
private boolean checkToolPath(TextField<String> path, String[] args) {
ProcessResult result = ProcessHelper.executeScript(path.getInputName() + " path:: '" + path.getValue() + "'", args);