src/main/java/com/gitblit/wicket/pages/FilestorePage.java | ●●●●● patch | view | raw | blame | history | |
src/main/java/com/gitblit/wicket/pages/RootPage.java | ●●●●● patch | view | raw | blame | history |
src/main/java/com/gitblit/wicket/pages/FilestorePage.java
@@ -29,11 +29,10 @@ import org.apache.wicket.markup.repeater.data.ListDataProvider; import com.gitblit.Constants; import com.gitblit.Keys; import com.gitblit.models.FilestoreModel; import com.gitblit.models.UserModel; import com.gitblit.wicket.FilestoreUI; import com.gitblit.wicket.GitBlitWebSession; import com.gitblit.wicket.RequiresAdminRole; import com.gitblit.wicket.WicketUtils; /** @@ -41,27 +40,18 @@ * Certain errors also displayed to aid in fault finding * * @author Paul Martin * * */ @RequiresAdminRole public class FilestorePage extends RootPage { public FilestorePage() { super(); setupPage("", ""); // check to see if we should display a login message boolean authenticateView = app().settings().getBoolean(Keys.web.authenticateViewPages, true); if (authenticateView && !GitBlitWebSession.get().isLoggedIn()) { String messageSource = app().settings().getString(Keys.web.loginMessage, "gitblit"); return; } final List<FilestoreModel> files = app().filestore().getAllObjects(); final long nBytesUsed = app().filestore().getFilestoreUsedByteCount(); final long nBytesAvailable = app().filestore().getFilestoreAvailableByteCount(); // Load the markdown welcome message String messageSource = app().settings().getString(Keys.web.repositoriesMessage, "gitblit"); String message = MessageFormat.format(getString("gb.filestoreStats"), files.size(), FileUtils.byteCountToDisplaySize(nBytesUsed), FileUtils.byteCountToDisplaySize(nBytesAvailable) ); src/main/java/com/gitblit/wicket/pages/RootPage.java
@@ -185,6 +185,11 @@ // navigation links List<NavLink> navLinks = new ArrayList<NavLink>(); if (!authenticateView || (authenticateView && isLoggedIn)) { UserModel user = UserModel.ANONYMOUS; if (isLoggedIn) { user = GitBlitWebSession.get().getUser(); } navLinks.add(new PageNavLink(isLoggedIn ? "gb.myDashboard" : "gb.dashboard", MyDashboardPage.class, getRootPageParameters())); if (isLoggedIn && app().tickets().isReady()) { @@ -192,7 +197,9 @@ } navLinks.add(new PageNavLink("gb.repositories", RepositoriesPage.class, getRootPageParameters())); if (user.canAdmin()) { navLinks.add(new PageNavLink("gb.filestore", FilestorePage.class, getRootPageParameters())); } navLinks.add(new PageNavLink("gb.activity", ActivityPage.class, getRootPageParameters())); if (allowLucene) { navLinks.add(new PageNavLink("gb.search", LuceneSearchPage.class)); @@ -200,11 +207,6 @@ if (!authenticateView || (authenticateView && isLoggedIn)) { addDropDownMenus(navLinks); } UserModel user = UserModel.ANONYMOUS; if (isLoggedIn) { user = GitBlitWebSession.get().getUser(); } // add nav link extensions