From 8c8f1f537b62a608e9ef01b70bec5a8df4dc8e8a Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Wed, 16 Jan 2013 07:57:18 -0500
Subject: [PATCH] Escape metacharacters for settings updates
---
src/com/gitblit/wicket/panels/ActivityPanel.java | 19 ++++++++++---------
1 files changed, 10 insertions(+), 9 deletions(-)
diff --git a/src/com/gitblit/wicket/panels/ActivityPanel.java b/src/com/gitblit/wicket/panels/ActivityPanel.java
index f75cf7d..669c36b 100644
--- a/src/com/gitblit/wicket/panels/ActivityPanel.java
+++ b/src/com/gitblit/wicket/panels/ActivityPanel.java
@@ -24,8 +24,10 @@
import org.apache.wicket.markup.repeater.data.ListDataProvider;
import com.gitblit.Constants;
+import com.gitblit.GitBlit;
+import com.gitblit.Keys;
import com.gitblit.models.Activity;
-import com.gitblit.models.Activity.RepositoryCommit;
+import com.gitblit.models.RepositoryCommit;
import com.gitblit.utils.StringUtils;
import com.gitblit.wicket.WicketUtils;
import com.gitblit.wicket.pages.CommitDiffPage;
@@ -50,13 +52,14 @@
Collections.sort(recentActivity);
+ final int shortHashLen = GitBlit.getInteger(Keys.web.shortCommitIdLength, 6);
DataView<Activity> activityView = new DataView<Activity>("activity",
new ListDataProvider<Activity>(recentActivity)) {
private static final long serialVersionUID = 1L;
public void populateItem(final Item<Activity> activityItem) {
final Activity entry = activityItem.getModelObject();
- activityItem.add(WicketUtils.createDatestampLabel("title", entry.startDate, getTimeZone()));
+ activityItem.add(WicketUtils.createDatestampLabel("title", entry.startDate, getTimeZone(), getTimeUtils()));
// display the commits in chronological order
DataView<RepositoryCommit> commits = new DataView<RepositoryCommit>("commit",
@@ -68,17 +71,17 @@
// commit time of day
commitItem.add(WicketUtils.createTimeLabel("time", commit.getCommitterIdent()
- .getWhen(), getTimeZone()));
+ .getWhen(), getTimeZone(), getTimeUtils()));
// avatar
- commitItem.add(new GravatarImage("avatar", commit.getAuthorIdent(), 36));
+ commitItem.add(new GravatarImage("avatar", commit.getAuthorIdent(), 40));
// merge icon
if (commit.getParentCount() > 1) {
commitItem.add(WicketUtils.newImage("commitIcon",
"commit_merge_16x16.png"));
} else {
- commitItem.add(WicketUtils.newBlankImage("commitIcon"));
+ commitItem.add(WicketUtils.newBlankImage("commitIcon").setVisible(false));
}
// author search link
@@ -105,7 +108,7 @@
commitItem.add(branchLink);
LinkPanel commitid = new LinkPanel("commitid", "list subject",
- commit.getShortName(), CommitPage.class,
+ commit.getName().substring(0, shortHashLen), CommitPage.class,
WicketUtils.newObjectParameter(commit.repository, commit.getName()), true);
commitItem.add(commitid);
@@ -129,9 +132,7 @@
commitItem.add(new RefsPanel("commitRefs", commit.repository, commit
.getRefs()));
- // view, diff, tree links
- commitItem.add(new BookmarkablePageLink<Void>("view", CommitPage.class,
- WicketUtils.newObjectParameter(commit.repository, commit.getName())));
+ // diff, tree links
commitItem.add(new BookmarkablePageLink<Void>("diff", CommitDiffPage.class,
WicketUtils.newObjectParameter(commit.repository, commit.getName()))
.setEnabled(commit.getParentCount() > 0));
--
Gitblit v1.9.1