diff --git a/src/main/java/org/olat/admin/sysinfo/LargeFilesController.java b/src/main/java/org/olat/admin/sysinfo/LargeFilesController.java index d0f88229b924bfdcc0a8239fadea843e7a1c9d6b..03c628e6c23f18d29e9cc106d55762816f0d4500 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 d2c908c456c7c5698fd34f614f7746e1095993f0..f63248f0ad20f867506387cb0e9114dbca4f1dfe 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 c2ace48661ff0d940ab1457c23c793fb83c445e8..b07c6583292b996134e36a4337605e139af94f46 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 f4481d73470e6d695968aa5cb114ebf6c772fc0b..eefc4554c0903065934b0aaaa50732df582b6a2f 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");