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

OO-4375 Added configuration for file size indicator

parent 006efd20
No related branches found
No related tags found
No related merge requests found
......@@ -38,6 +38,7 @@ import org.olat.admin.sysinfo.model.LargeFilesTableModel.LargeFilesTableColumns;
import org.olat.core.commons.persistence.SortKey;
import org.olat.core.commons.services.vfs.VFSFilterKeys;
import org.olat.core.commons.services.vfs.VFSMetadata;
import org.olat.core.commons.services.vfs.VFSRepositoryModule;
import org.olat.core.commons.services.vfs.VFSRepositoryService;
import org.olat.core.commons.services.vfs.VFSRevision;
import org.olat.core.gui.UserRequest;
......@@ -112,6 +113,8 @@ public class LargeFilesController extends FormBasicController implements Extende
@Autowired
private VFSRepositoryService vfsRepositoryService;
@Autowired
private VFSRepositoryModule vfsRepositoryModule;
public LargeFilesController(UserRequest ureq, WindowControl wControl) {
......@@ -297,7 +300,7 @@ public class LargeFilesController extends FormBasicController implements Extende
columnsModel.addFlexiColumnModel(new DefaultFlexiColumnModel(false, LargeFilesTableColumns.key));
columnsModel.addFlexiColumnModel(new DefaultFlexiColumnModel(false, LargeFilesTableColumns.uuid));
columnsModel.addFlexiColumnModel(new DefaultFlexiColumnModel(true, LargeFilesTableColumns.name, new LargeFilesNameCellRenderer()));
columnsModel.addFlexiColumnModel(new DefaultFlexiColumnModel(true, LargeFilesTableColumns.size, new LargeFilesSizeCellRenderer()));
columnsModel.addFlexiColumnModel(new DefaultFlexiColumnModel(true, LargeFilesTableColumns.size, new LargeFilesSizeCellRenderer(vfsRepositoryModule)));
columnsModel.addFlexiColumnModel(new DefaultFlexiColumnModel(true, LargeFilesTableColumns.path));
columnsModel.addFlexiColumnModel(new DefaultFlexiColumnModel(false, LargeFilesTableColumns.age, new LargeFilesAgeCellRenderer()));
......
......@@ -19,6 +19,7 @@
*/
package org.olat.admin.sysinfo.gui;
import org.olat.core.commons.services.vfs.VFSRepositoryModule;
import org.olat.core.gui.components.form.flexible.impl.elements.table.FlexiCellRenderer;
import org.olat.core.gui.components.form.flexible.impl.elements.table.FlexiTableComponent;
import org.olat.core.gui.render.Renderer;
......@@ -36,6 +37,12 @@ import org.olat.core.util.StringHelper;
*
*/
public class LargeFilesSizeCellRenderer implements FlexiCellRenderer{
VFSRepositoryModule vfsRepositoryModule;
public LargeFilesSizeCellRenderer(VFSRepositoryModule vfsRepositoryModule) {
this.vfsRepositoryModule = vfsRepositoryModule;
}
@Override
public void render(Renderer renderer, StringOutput target, Object cellValue, int row, FlexiTableComponent source,
URLBuilder ubu, Translator translator) {
......@@ -44,9 +51,9 @@ public class LargeFilesSizeCellRenderer implements FlexiCellRenderer{
String color;
Long size = ((Number)cellValue).longValue();
if(size < 5000) {
if(size < vfsRepositoryModule.getLowerBorder()) {
color = "okay";
} else if(size < 10000) {
} else if(size < vfsRepositoryModule.getUpperBorder()) {
color = "warning";
} else {
color = "large";
......
......@@ -29,6 +29,7 @@ import org.olat.core.util.coordinate.CoordinatorManager;
import org.olat.core.util.vfs.VFSConstants;
import org.olat.core.util.vfs.VFSStatus;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Service;
/**
......@@ -44,6 +45,11 @@ public class VFSRepositoryModule extends AbstractSpringModule {
private boolean migrated;
@Value("${vfs.largefiles.upperborder}")
private long upperBorder;
@Value("${vfs.largefiles.lowerborder}")
private long lowerBorder;
@Autowired
public VFSRepositoryModule(CoordinatorManager coordinatorManager) {
super(coordinatorManager);
......@@ -109,5 +115,13 @@ public class VFSRepositoryModule extends AbstractSpringModule {
&& !filename.equals("__MACOSX")
? VFSConstants.YES : VFSConstants.NO;
}
public long getUpperBorder() {
return upperBorder;
}
public long getLowerBorder() {
return lowerBorder;
}
}
......@@ -1672,3 +1672,9 @@ live.stream.edit.coach=false
# Profile to control witch stream is visible for the watchers.
live.stream.player.profile=both
live.stream.player.profile.values=both,stream1,stream2
###############################################################################
# Options for the VFS large files admin GUI
###############################################################################
vfs.largefiles.upperborder=157286400
vfs.largefiles.lowerborder=26214400
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