From f75535759570bbc4784ee8324b0d1b8dfb01766f Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gmail.com>
Date: Tue, 08 Dec 2015 07:58:21 -0500
Subject: [PATCH] Merge pull request #973 from paulsputer/967-Filestore-Help
---
src/main/java/com/gitblit/wicket/pages/FilestorePage.java | 14 +++++++++++---
1 files changed, 11 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/gitblit/wicket/pages/FilestorePage.java b/src/main/java/com/gitblit/wicket/pages/FilestorePage.java
index 97d5f25..be0181b 100644
--- a/src/main/java/com/gitblit/wicket/pages/FilestorePage.java
+++ b/src/main/java/com/gitblit/wicket/pages/FilestorePage.java
@@ -18,6 +18,7 @@
import java.text.DateFormat;
import java.text.MessageFormat;
import java.text.SimpleDateFormat;
+import java.util.ArrayList;
import java.util.List;
import org.apache.commons.io.FileUtils;
@@ -31,9 +32,12 @@
import com.gitblit.Constants;
import com.gitblit.models.FilestoreModel;
import com.gitblit.models.UserModel;
+import com.gitblit.wicket.CacheControl;
import com.gitblit.wicket.FilestoreUI;
+import com.gitblit.wicket.GitBlitWebSession;
import com.gitblit.wicket.RequiresAdminRole;
import com.gitblit.wicket.WicketUtils;
+import com.gitblit.wicket.CacheControl.LastModified;
/**
* Page to display the current status of the filestore.
@@ -41,17 +45,22 @@
*
* @author Paul Martin
*/
-@RequiresAdminRole
+@CacheControl(LastModified.ACTIVITY)
public class FilestorePage extends RootPage {
public FilestorePage() {
super();
setupPage("", "");
- final List<FilestoreModel> files = app().filestore().getAllObjects();
+ final UserModel user = (GitBlitWebSession.get().getUser() == null) ? UserModel.ANONYMOUS : GitBlitWebSession.get().getUser();
final long nBytesUsed = app().filestore().getFilestoreUsedByteCount();
final long nBytesAvailable = app().filestore().getFilestoreAvailableByteCount();
+ List<FilestoreModel> files = app().filestore().getAllObjects(user);
+ if (files == null) {
+ files = new ArrayList<FilestoreModel>();
+ }
+
String message = MessageFormat.format(getString("gb.filestoreStats"), files.size(),
FileUtils.byteCountToDisplaySize(nBytesUsed), FileUtils.byteCountToDisplaySize(nBytesAvailable) );
@@ -63,7 +72,6 @@
BookmarkablePageLink<Void> helpLink = new BookmarkablePageLink<Void>("filestoreHelp", FilestoreUsage.class);
helpLink.add(new Label("helpMessage", getString("gb.filestoreHelp")));
add(helpLink);
-
DataView<FilestoreModel> filesView = new DataView<FilestoreModel>("fileRow",
new ListDataProvider<FilestoreModel>(files)) {
--
Gitblit v1.9.1