From 5bb79fbb553a11e6582392f658233cf58a4ceb11 Mon Sep 17 00:00:00 2001
From: Paul Martin <paul@paulsputer.com>
Date: Wed, 06 Apr 2016 14:31:41 -0400
Subject: [PATCH] Fix for #1042 - Filestore items now shown as icons
---
src/main/java/com/gitblit/wicket/pages/TreePage.java | 16 ++++------------
1 files changed, 4 insertions(+), 12 deletions(-)
diff --git a/src/main/java/com/gitblit/wicket/pages/TreePage.java b/src/main/java/com/gitblit/wicket/pages/TreePage.java
index 3961e04..eecad26 100644
--- a/src/main/java/com/gitblit/wicket/pages/TreePage.java
+++ b/src/main/java/com/gitblit/wicket/pages/TreePage.java
@@ -98,15 +98,15 @@
final PathModel entry = item.getModelObject();
item.add(new Label("pathPermissions", JGitUtils.getPermissionsFromMode(entry.mode)));
-
+ item.add(WicketUtils.setHtmlTooltip(new Label("filestore", ""), getString("gb.filestore"))
+ .setVisible(entry.isFilestoreItem()));
+
if (entry.isParentPath) {
// parent .. path
item.add(WicketUtils.newBlankImage("pathIcon"));
item.add(new Label("pathSize", ""));
item.add(new LinkPanel("pathName", null, entry.name, TreePage.class,
- WicketUtils
- .newPathParameter(repositoryName, id, entry.path)));
- item.add(new Label("filestore", getString("gb.filestore")).setVisible(false));
+ WicketUtils.newPathParameter(repositoryName, id, entry.path)));
item.add(new Label("pathLinks", ""));
} else {
if (entry.isTree()) {
@@ -116,8 +116,6 @@
item.add(new LinkPanel("pathName", "list", entry.name, TreePage.class,
WicketUtils.newPathParameter(repositoryName, id,
entry.path)));
-
- item.add(new Label("filestore", getString("gb.filestore")).setVisible(false));
// links
Fragment links = new Fragment("pathLinks", "treeLinks", this);
@@ -146,8 +144,6 @@
getShortObjectId(submoduleId), TreePage.class,
WicketUtils.newPathParameter(submodulePath, submoduleId, "")).setEnabled(hasSubmodule));
- item.add(new Label("filestore", getString("gb.filestore")).setVisible(false));
-
Fragment links = new Fragment("pathLinks", "submoduleLinks", this);
links.add(new BookmarkablePageLink<Void>("view", SummaryPage.class,
WicketUtils.newRepositoryParameter(submodulePath)).setEnabled(hasSubmodule));
@@ -175,8 +171,6 @@
Fragment links = new Fragment("pathLinks", "blobLinks", this);
if (entry.isFilestoreItem()) {
- item.add(new Label("filestore", getString("gb.filestore")).setVisible(true));
-
item.add(new LinkPanel("pathName", "list", displayPath, new Link<Object>("link", null) {
private static final long serialVersionUID = 1L;
@@ -250,8 +244,6 @@
}});
} else {
- item.add(new Label("filestore", getString("gb.filestore")).setVisible(false));
-
item.add(new LinkPanel("pathName", "list", displayPath, BlobPage.class,
WicketUtils.newPathParameter(repositoryName, id,
path)));
--
Gitblit v1.9.1