Skip to content
Snippets Groups Projects
Commit f02e6871 authored by aboeckle's avatar aboeckle
Browse files

OO-4375 Changed bytes to megabytes

parent 39a741c7
No related branches found
No related tags found
No related merge requests found
......@@ -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;
}
......
......@@ -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
......
......@@ -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
......
......@@ -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");
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment