From 9bdf88df00e9abf99442e14a33ed6215b32026b6 Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Tue, 02 Oct 2012 17:22:35 -0400
Subject: [PATCH] Use a custom redirect mechanism to workaround servlet container interference
---
src/com/gitblit/wicket/panels/RepositoriesPanel.java | 71 ++++++++++++++++++++++++++++-------
1 files changed, 57 insertions(+), 14 deletions(-)
diff --git a/src/com/gitblit/wicket/panels/RepositoriesPanel.java b/src/com/gitblit/wicket/panels/RepositoriesPanel.java
index ee6e119..4c9ed28 100644
--- a/src/com/gitblit/wicket/panels/RepositoriesPanel.java
+++ b/src/com/gitblit/wicket/panels/RepositoriesPanel.java
@@ -46,16 +46,19 @@
import com.gitblit.GitBlit;
import com.gitblit.Keys;
import com.gitblit.SyndicationServlet;
+import com.gitblit.models.ProjectModel;
import com.gitblit.models.RepositoryModel;
import com.gitblit.models.UserModel;
import com.gitblit.utils.StringUtils;
-import com.gitblit.utils.TimeUtils;
import com.gitblit.wicket.GitBlitWebSession;
import com.gitblit.wicket.WicketUtils;
import com.gitblit.wicket.pages.BasePage;
import com.gitblit.wicket.pages.EditRepositoryPage;
import com.gitblit.wicket.pages.EmptyRepositoryPage;
+import com.gitblit.wicket.pages.ProjectPage;
+import com.gitblit.wicket.pages.RepositoriesPage;
import com.gitblit.wicket.pages.SummaryPage;
+import com.gitblit.wicket.pages.UserPage;
public class RepositoriesPanel extends BasePanel {
@@ -74,6 +77,16 @@
final IDataProvider<RepositoryModel> dp;
Fragment adminLinks = new Fragment("adminPanel", "adminLinks", this);
+ adminLinks.add(new Link<Void>("clearCache") {
+
+ private static final long serialVersionUID = 1L;
+
+ @Override
+ public void onClick() {
+ GitBlit.self().resetRepositoryListCache();
+ setResponsePage(RepositoriesPage.class);
+ }
+ }.setVisible(GitBlit.getBoolean(Keys.git.cacheRepositoryList, true)));
adminLinks.add(new BookmarkablePageLink<Void>("newRepository", EditRepositoryPage.class));
add(adminLinks.setVisible(showAdmin));
@@ -102,10 +115,20 @@
roots.add(0, rootPath);
groups.put(rootPath, rootRepositories);
}
+
+ Map<String, ProjectModel> projects = new HashMap<String, ProjectModel>();
+ for (ProjectModel project : GitBlit.self().getProjectModels(user, true)) {
+ projects.put(project.name, project);
+ }
List<RepositoryModel> groupedModels = new ArrayList<RepositoryModel>();
for (String root : roots) {
List<RepositoryModel> subModels = groups.get(root);
- groupedModels.add(new GroupRepositoryModel(root, subModels.size()));
+ GroupRepositoryModel group = new GroupRepositoryModel(root, subModels.size());
+ if (projects.containsKey(root)) {
+ group.title = projects.get(root).title;
+ group.description = projects.get(root).description;
+ }
+ groupedModels.add(group);
Collections.sort(subModels);
groupedModels.addAll(subModels);
}
@@ -116,7 +139,7 @@
final String baseUrl = WicketUtils.getGitblitURL(getRequest());
final boolean showSwatch = GitBlit.getBoolean(Keys.web.repositoryListSwatches, true);
-
+
DataView<RepositoryModel> dataView = new DataView<RepositoryModel>("row", dp) {
private static final long serialVersionUID = 1L;
int counter;
@@ -134,7 +157,19 @@
currGroupName = entry.name;
Fragment row = new Fragment("rowContent", "groupRepositoryRow", this);
item.add(row);
- row.add(new Label("groupName", entry.toString()));
+
+ String name = entry.toString();
+ if (name.charAt(0) == '~') {
+ // user page
+ String username = name.substring(1);
+ UserModel user = GitBlit.self().getUserModel(username);
+ row.add(new LinkPanel("groupName", null, user == null ? username : user.getDisplayName(), UserPage.class, WicketUtils.newUsernameParameter(username)));
+ row.add(new Label("groupDescription", getString("gb.personalRepositories")));
+ } else {
+ // project page
+ row.add(new LinkPanel("groupName", null, name, ProjectPage.class, WicketUtils.newProjectParameter(name)));
+ row.add(new Label("groupDescription", entry.description == null ? "":entry.description));
+ }
WicketUtils.setCssClass(item, "group");
// reset counter so that first row is light background
counter = 0;
@@ -185,7 +220,7 @@
row.add(new Label("repositorySize", entry.size).setVisible(showSize));
} else {
// New repository
- row.add(new Label("repositorySize", "<span class='empty'>(empty)</span>")
+ row.add(new Label("repositorySize", "<span class='empty'>(" + getString("gb.empty") + ")</span>")
.setEscapeModelStrings(false));
}
@@ -236,20 +271,28 @@
row.add(WicketUtils.newBlankImage("accessRestrictionIcon"));
}
- row.add(new Label("repositoryOwner", entry.owner));
+ String owner = entry.owner;
+ if (!StringUtils.isEmpty(owner)) {
+ UserModel ownerModel = GitBlit.self().getUserModel(owner);
+ if (ownerModel != null) {
+ owner = ownerModel.getDisplayName();
+ }
+ }
+ row.add(new Label("repositoryOwner", owner));
String lastChange;
if (entry.lastChange.getTime() == 0) {
lastChange = "--";
} else {
- lastChange = TimeUtils.timeAgo(entry.lastChange);
+ lastChange = getTimeUtils().timeAgo(entry.lastChange);
}
Label lastChangeLabel = new Label("repositoryLastChange", lastChange);
row.add(lastChangeLabel);
- WicketUtils.setCssClass(lastChangeLabel, TimeUtils.timeAgoCss(entry.lastChange));
+ WicketUtils.setCssClass(lastChangeLabel, getTimeUtils().timeAgoCss(entry.lastChange));
boolean showOwner = user != null && user.username.equalsIgnoreCase(entry.owner);
- if (showAdmin) {
+ boolean myPersonalRepository = showOwner && entry.isUsersPersonalRepository(user.username);
+ if (showAdmin || myPersonalRepository) {
Fragment repositoryLinks = new Fragment("repositoryLinks",
"repositoryAdminLinks", this);
repositoryLinks.add(new BookmarkablePageLink<Void>("editRepository",
@@ -262,20 +305,19 @@
@Override
public void onClick() {
if (GitBlit.self().deleteRepositoryModel(entry)) {
- info(MessageFormat.format("Repository ''{0}'' deleted.", entry));
+ info(MessageFormat.format(getString("gb.repositoryDeleted"), entry));
if (dp instanceof SortableRepositoriesProvider) {
((SortableRepositoriesProvider) dp).remove(entry);
} else {
((RepositoriesProvider) dp).remove(entry);
}
} else {
- error(MessageFormat.format("Failed to delete repository ''{0}''!",
- entry));
+ error(MessageFormat.format(getString("gb.repositoryDeleteFailed"), entry));
}
}
};
deleteLink.add(new JavascriptEventConfirmation("onclick", MessageFormat.format(
- "Delete repository \"{0}\"?", entry)));
+ getString("gb.deleteRepository"), entry)));
repositoryLinks.add(deleteLink);
row.add(repositoryLinks);
} else if (showOwner) {
@@ -317,6 +359,7 @@
private static final long serialVersionUID = 1L;
int count;
+ String title;
GroupRepositoryModel(String name, int count) {
super(name, "", "", new Date(0));
@@ -325,7 +368,7 @@
@Override
public String toString() {
- return name + " (" + count + ")";
+ return StringUtils.isEmpty(title) ? name : title + " (" + count + ")";
}
}
--
Gitblit v1.9.1