From 9da97003c7f33a64ae5060f413f9c4c5d26efe78 Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Thu, 19 May 2011 19:01:45 -0400
Subject: [PATCH] Critical fix for servlet.
---
src/com/gitblit/wicket/pages/RepositoriesPage.java | 196 +++++++++++++++++++++++++++++++++++++++---------
1 files changed, 159 insertions(+), 37 deletions(-)
diff --git a/src/com/gitblit/wicket/pages/RepositoriesPage.java b/src/com/gitblit/wicket/pages/RepositoriesPage.java
index 3ab6366..14a5426 100644
--- a/src/com/gitblit/wicket/pages/RepositoriesPage.java
+++ b/src/com/gitblit/wicket/pages/RepositoriesPage.java
@@ -4,11 +4,14 @@
import java.io.FileReader;
import java.io.InputStream;
import java.io.InputStreamReader;
-import java.io.StringWriter;
+import java.util.ArrayList;
import java.util.Collections;
import java.util.Comparator;
+import java.util.Date;
+import java.util.HashMap;
import java.util.Iterator;
import java.util.List;
+import java.util.Map;
import org.apache.wicket.Component;
import org.apache.wicket.PageParameters;
@@ -20,13 +23,16 @@
import org.apache.wicket.markup.html.panel.Fragment;
import org.apache.wicket.markup.repeater.Item;
import org.apache.wicket.markup.repeater.data.DataView;
+import org.apache.wicket.markup.repeater.data.IDataProvider;
+import org.apache.wicket.markup.repeater.data.ListDataProvider;
import org.apache.wicket.model.IModel;
import org.apache.wicket.model.Model;
import org.apache.wicket.resource.ContextRelativeResource;
-import org.tautua.markdownpapers.Markdown;
+import com.gitblit.Constants.AccessRestrictionType;
import com.gitblit.GitBlit;
import com.gitblit.Keys;
+import com.gitblit.utils.MarkdownUtils;
import com.gitblit.utils.StringUtils;
import com.gitblit.utils.TimeUtils;
import com.gitblit.wicket.BasePage;
@@ -34,44 +40,57 @@
import com.gitblit.wicket.LinkPanel;
import com.gitblit.wicket.WicketUtils;
import com.gitblit.wicket.models.RepositoryModel;
+import com.gitblit.wicket.models.UserModel;
public class RepositoriesPage extends BasePage {
public RepositoriesPage() {
super();
setupPage("", "");
-
- boolean showAdmin = false;
+
+ final boolean showAdmin;
if (GitBlit.self().settings().getBoolean(Keys.web.authenticateAdminPages, true)) {
boolean allowAdmin = GitBlit.self().settings().getBoolean(Keys.web.allowAdministration, false);
showAdmin = allowAdmin && GitBlitWebSession.get().canAdmin();
+ // authentication requires state and session
+ setStatelessHint(false);
} else {
showAdmin = GitBlit.self().settings().getBoolean(Keys.web.allowAdministration, false);
+ if (GitBlit.self().settings().getBoolean(Keys.web.authenticateViewPages, false)) {
+ // authentication requires state and session
+ setStatelessHint(false);
+ } else {
+ // no authentication required, no state and no session required
+ setStatelessHint(true);
+ }
}
Fragment adminLinks = new Fragment("adminPanel", "adminLinks", this);
- adminLinks.add(new BookmarkablePageLink<Void>("newRepository", RepositoriesPage.class));
- adminLinks.add(new BookmarkablePageLink<Void>("newUser", RepositoriesPage.class));
+ adminLinks.add(new BookmarkablePageLink<Void>("newRepository", EditRepositoryPage.class));
+ adminLinks.add(new BookmarkablePageLink<Void>("newUser", EditUserPage.class));
+ adminLinks.add(new BookmarkablePageLink<Void>("editUsers", RepositoriesPage.class));
add(adminLinks.setVisible(showAdmin));
+
+ // display an error message cached from a redirect
+ String cachedMessage = GitBlitWebSession.get().clearErrorMessage();
+ if (!StringUtils.isEmpty(cachedMessage)) {
+ error(cachedMessage);
+ System.out.println("displayed message");
+ }
// Load the markdown welcome message
String messageSource = GitBlit.self().settings().getString(Keys.web.repositoriesMessage, "gitblit");
- String message = "";
+ String message = "<br/>";
if (messageSource.equalsIgnoreCase("gitblit")) {
// Read default welcome message
try {
- ContextRelativeResource res = new ContextRelativeResource("/com/gitblit/wicket/resources/welcome.mkd");
+ ContextRelativeResource res = WicketUtils.getResource("welcome.mkd");
InputStream is = res.getResourceStream().getInputStream();
InputStreamReader reader = new InputStreamReader(is);
- StringWriter writer = new StringWriter();
- Markdown markdown = new Markdown();
- markdown.transform(reader, writer);
- message = writer.toString().trim();
- reader.close();
- writer.close();
+ message = MarkdownUtils.transformMarkdown(reader);
} catch (Throwable t) {
message = "Failed to read default welcome message!";
- error(message, t);
+ error(message, t, false);
}
} else {
// Read user-supplied welcome message
@@ -80,15 +99,10 @@
if (file.exists()) {
try {
FileReader reader = new FileReader(file);
- StringWriter writer = new StringWriter();
- Markdown markdown = new Markdown();
- markdown.transform(reader, writer);
- message = writer.toString().trim();
- reader.close();
- writer.close();
+ message = MarkdownUtils.transformMarkdown(reader);
} catch (Throwable t) {
message = "Failed to read " + file;
- error(message, t);
+ error(message, t, false);
}
} else {
message = messageSource + " is not a valid file.";
@@ -96,39 +110,138 @@
}
}
Component repositoriesMessage = new Label("repositoriesMessage", message).setEscapeModelStrings(false);
- if (!showAdmin) {
- WicketUtils.setCssStyle(repositoriesMessage, "padding-top:10px");
- }
add(repositoriesMessage);
- List<RepositoryModel> rows = GitBlit.self().getRepositories(getRequest());
- DataProvider dp = new DataProvider(rows);
- DataView<RepositoryModel> dataView = new DataView<RepositoryModel>("repository", dp) {
+ final Map<AccessRestrictionType, String> accessRestrictionTranslations = getAccessRestrictions();
+ final UserModel user = GitBlitWebSession.get().getUser();
+ List<RepositoryModel> models = GitBlit.self().getRepositoryModels(user);
+ IDataProvider<RepositoryModel> dp;
+
+ if (GitBlit.self().settings().getString(Keys.web.repositoryListType, "flat").equalsIgnoreCase("grouped")) {
+ Map<String, List<RepositoryModel>> groups = new HashMap<String, List<RepositoryModel>>();
+ for (RepositoryModel model : models) {
+ String rootPath = StringUtils.getRootPath(model.name);
+ if (StringUtils.isEmpty(rootPath)) {
+ rootPath = GitBlit.self().settings().getString(Keys.web.repositoryRootGroupName, " ");
+ }
+ if (!groups.containsKey(rootPath)) {
+ groups.put(rootPath, new ArrayList<RepositoryModel>());
+ }
+ groups.get(rootPath).add(model);
+ }
+ List<String> roots = new ArrayList<String>(groups.keySet());
+ Collections.sort(roots);
+ List<RepositoryModel> groupedModels = new ArrayList<RepositoryModel>();
+ for (String root : roots) {
+ groupedModels.add(new GroupRepositoryModel(root));
+ groupedModels.addAll(groups.get(root));
+ }
+ dp = new ListDataProvider<RepositoryModel>(groupedModels);
+ } else {
+ dp = new DataProvider(models);
+ }
+
+ DataView<RepositoryModel> dataView = new DataView<RepositoryModel>("row", dp) {
private static final long serialVersionUID = 1L;
int counter = 0;
public void populateItem(final Item<RepositoryModel> item) {
final RepositoryModel entry = item.getModelObject();
- PageParameters pp = WicketUtils.newRepositoryParameter(entry.name);
- item.add(new LinkPanel("repositoryName", "list", entry.name, SummaryPage.class, pp));
- item.add(new LinkPanel("repositoryDescription", "list", entry.description, SummaryPage.class, pp));
- item.add(new Label("repositoryOwner", entry.owner));
+ if (entry instanceof GroupRepositoryModel) {
+ Fragment row = new Fragment("rowContent", "groupRow", this);
+ item.add(row);
+ row.add(new Label("groupName", entry.name));
+ WicketUtils.setCssClass(item, "group");
+ return;
+ }
+ Fragment row = new Fragment("rowContent", "repositoryRow", this);
+ item.add(row);
+ if (entry.hasCommits) {
+ // Existing repository
+ PageParameters pp = WicketUtils.newRepositoryParameter(entry.name);
+ row.add(new LinkPanel("repositoryName", "list", entry.name, SummaryPage.class, pp));
+ row.add(new LinkPanel("repositoryDescription", "list", entry.description, SummaryPage.class, pp));
+ } else {
+ // New repository
+ row.add(new Label("repositoryName", entry.name + "<span class='empty'>(empty)</span>").setEscapeModelStrings(false));
+ row.add(new Label("repositoryDescription", entry.description));
+ }
+
+ if (entry.useTickets) {
+ row.add(WicketUtils.newImage("ticketsIcon", "bug_16x16.png", getString("gb.tickets")));
+ } else {
+ row.add(WicketUtils.newBlankImage("ticketsIcon"));
+ }
+
+ if (entry.useDocs) {
+ row.add(WicketUtils.newImage("docsIcon", "book_16x16.png", getString("gb.docs")));
+ } else {
+ row.add(WicketUtils.newBlankImage("docsIcon"));
+ }
+
+ if (entry.isFrozen) {
+ row.add(WicketUtils.newImage("frozenIcon", "cold_16x16.png", getString("gb.isFrozen")));
+ } else {
+ row.add(WicketUtils.newClearPixel("frozenIcon").setVisible(false));
+ }
+ switch (entry.accessRestriction) {
+ case NONE:
+ row.add(WicketUtils.newBlankImage("accessRestrictionIcon"));
+ break;
+ case PUSH:
+ row.add(WicketUtils.newImage("accessRestrictionIcon", "lock_go_16x16.png", accessRestrictionTranslations.get(entry.accessRestriction)));
+ break;
+ case CLONE:
+ row.add(WicketUtils.newImage("accessRestrictionIcon", "lock_pull_16x16.png", accessRestrictionTranslations.get(entry.accessRestriction)));
+ break;
+ case VIEW:
+ row.add(WicketUtils.newImage("accessRestrictionIcon", "shield_16x16.png", accessRestrictionTranslations.get(entry.accessRestriction)));
+ break;
+ default:
+ row.add(WicketUtils.newBlankImage("accessRestrictionIcon"));
+ }
+
+ row.add(new Label("repositoryOwner", entry.owner));
String lastChange = TimeUtils.timeAgo(entry.lastChange);
Label lastChangeLabel = new Label("repositoryLastChange", lastChange);
- item.add(lastChangeLabel);
+ row.add(lastChangeLabel);
WicketUtils.setCssClass(lastChangeLabel, TimeUtils.timeAgoCss(entry.lastChange));
+ boolean showOwner = user != null && user.getUsername().equalsIgnoreCase(entry.owner);
+ if (showAdmin) {
+ Fragment repositoryLinks = new Fragment("repositoryLinks", "repositoryAdminLinks", this);
+ repositoryLinks.add(new BookmarkablePageLink<Void>("editRepository", EditRepositoryPage.class, WicketUtils.newRepositoryParameter(entry.name)));
+ repositoryLinks.add(new BookmarkablePageLink<Void>("renameRepository", EditRepositoryPage.class, WicketUtils.newRepositoryParameter(entry.name)).setEnabled(false));
+ repositoryLinks.add(new BookmarkablePageLink<Void>("deleteRepository", EditRepositoryPage.class, WicketUtils.newRepositoryParameter(entry.name)).setEnabled(false));
+ row.add(repositoryLinks);
+ } else if (showOwner) {
+ Fragment repositoryLinks = new Fragment("repositoryLinks", "repositoryOwnerLinks", this);
+ repositoryLinks.add(new BookmarkablePageLink<Void>("editRepository", EditRepositoryPage.class, WicketUtils.newRepositoryParameter(entry.name)));
+ row.add(repositoryLinks);
+ } else {
+ row.add(new Label("repositoryLinks"));
+ }
WicketUtils.setAlternatingBackground(item, counter);
counter++;
}
};
add(dataView);
- add(newSort("orderByRepository", SortBy.repository, dp, dataView));
- add(newSort("orderByDescription", SortBy.description, dp, dataView));
- add(newSort("orderByOwner", SortBy.owner, dp, dataView));
- add(newSort("orderByDate", SortBy.date, dp, dataView));
+ if (dp instanceof SortableDataProvider<?>) {
+ // add sortable header
+ SortableDataProvider<?> sdp = (SortableDataProvider<?>) dp;
+ Fragment fragment = new Fragment("headerContent", "flatHeader", this);
+ fragment.add(newSort("orderByRepository", SortBy.repository, sdp, dataView));
+ fragment.add(newSort("orderByDescription", SortBy.description, sdp, dataView));
+ fragment.add(newSort("orderByOwner", SortBy.owner, sdp, dataView));
+ fragment.add(newSort("orderByDate", SortBy.date, sdp, dataView));
+ add(fragment);
+ } else {
+ // not sortable
+ Fragment fragment = new Fragment("headerContent", "groupHeader", this);
+ add(fragment);
+ }
}
protected enum SortBy {
@@ -213,4 +326,13 @@
return list.subList(first, first + count).iterator();
}
}
+
+ private class GroupRepositoryModel extends RepositoryModel {
+
+ private static final long serialVersionUID = 1L;
+
+ GroupRepositoryModel(String name) {
+ super(name, "", "", new Date(0));
+ }
+ }
}
--
Gitblit v1.9.1