From f02e6871847ec6a6f9550d20e25fbaa80416027c Mon Sep 17 00:00:00 2001
From: aboeckle <alexander.boeckle@frentix.com>
Date: Fri, 10 Jan 2020 14:53:20 +0100
Subject: [PATCH] OO-4375 Changed bytes to megabytes
---
.../java/org/olat/admin/sysinfo/LargeFilesController.java | 5 +++--
.../org/olat/admin/sysinfo/_i18n/LocalStrings_de.properties | 2 +-
.../org/olat/admin/sysinfo/_i18n/LocalStrings_en.properties | 2 +-
src/main/java/org/olat/core/util/Formatter.java | 2 +-
4 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/src/main/java/org/olat/admin/sysinfo/LargeFilesController.java b/src/main/java/org/olat/admin/sysinfo/LargeFilesController.java
index d0f88229b92..03c628e6c23 100644
--- a/src/main/java/org/olat/admin/sysinfo/LargeFilesController.java
+++ b/src/main/java/org/olat/admin/sysinfo/LargeFilesController.java
@@ -136,7 +136,8 @@ public class LargeFilesController extends FormBasicController implements Extende
maxResults = Integer.parseInt(maxResultEl.getValue());
}
if(StringHelper.containsNonWhitespace(minSizeEl.getValue())) {
- minSize = Integer.parseInt(minSizeEl.getValue());
+ minSize = (int) (Double.parseDouble(minSizeEl.getValue()) * Formatter.BYTE_UNIT * Formatter.BYTE_UNIT);
+ System.out.println(minSize);
}
if(StringHelper.containsNonWhitespace(downloadCountMinEl.getValue())) {
downloadCountMin = Integer.parseInt(downloadCountMinEl.getValue());
@@ -442,7 +443,7 @@ public class LargeFilesController extends FormBasicController implements Extende
if(minSizeEl.getValue() != "") {
try {
- if(Integer.parseInt(minSizeEl.getValue()) <= 0) {
+ if(Double.parseDouble(minSizeEl.getValue()) <= 0) {
minSizeEl.setErrorKey("largefiles.filter.error.small", null);
allOK &= false;
}
diff --git a/src/main/java/org/olat/admin/sysinfo/_i18n/LocalStrings_de.properties b/src/main/java/org/olat/admin/sysinfo/_i18n/LocalStrings_de.properties
index d2c908c456c..f63248f0ad2 100644
--- a/src/main/java/org/olat/admin/sysinfo/_i18n/LocalStrings_de.properties
+++ b/src/main/java/org/olat/admin/sysinfo/_i18n/LocalStrings_de.properties
@@ -113,7 +113,7 @@ largefiles.filter.revision.count.min=Min. Anzahl Versionen
largefiles.filter.revision.not=Nur Dateien
largefiles.filter.revision.only=Nur Versionen
largefiles.filter.revision=Version
-largefiles.filter.size.min=Min. Gr\u00f6\u00dfe
+largefiles.filter.size.min=Min. Gr\u00f6\u00dfe (MB)
largefiles.filter.trashed.both=Beide
largefiles.filter.trashed.not=Nicht gel\u00f6scht
largefiles.filter.trashed.only=Nur gel\u00f6scht
diff --git a/src/main/java/org/olat/admin/sysinfo/_i18n/LocalStrings_en.properties b/src/main/java/org/olat/admin/sysinfo/_i18n/LocalStrings_en.properties
index c2ace48661f..b07c6583292 100644
--- a/src/main/java/org/olat/admin/sysinfo/_i18n/LocalStrings_en.properties
+++ b/src/main/java/org/olat/admin/sysinfo/_i18n/LocalStrings_en.properties
@@ -113,7 +113,7 @@ largefiles.filter.revision.count.min=Revision count min
largefiles.filter.revision.not=Files only
largefiles.filter.revision.only=Revisions only
largefiles.filter.revision=Revision
-largefiles.filter.size.min=Size min
+largefiles.filter.size.min=Size min (MB)
largefiles.filter.trashed.both=Both
largefiles.filter.trashed.not=Not trashed
largefiles.filter.trashed.only=Trashed
diff --git a/src/main/java/org/olat/core/util/Formatter.java b/src/main/java/org/olat/core/util/Formatter.java
index f4481d73470..eefc4554c09 100644
--- a/src/main/java/org/olat/core/util/Formatter.java
+++ b/src/main/java/org/olat/core/util/Formatter.java
@@ -63,7 +63,7 @@ import org.olat.core.util.filter.impl.HtmlMathScanner;
*/
public class Formatter {
- private static final int BYTE_UNIT = 1000;
+ public static final int BYTE_UNIT = 1000;
private static final DateFormat formatterDatetimeFilesystem = new SimpleDateFormat("yyyy-MM-dd'T'HH-mm-ss_SSS");
private static final DateFormat formatterDatetimeWithMinutes = new SimpleDateFormat("yyyy-MM-dd'T'HH-mm");
private static final DateFormat formatDateTime = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss");
--
GitLab