From 5dd8057b49803a7c1b84112418dcfca7b256fce0 Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Tue, 17 Sep 2013 17:13:36 -0400
Subject: [PATCH] Remove incomplete and deprecated TicGit feature
---
src/main/java/com/gitblit/wicket/pages/OverviewPage.java | 20 ++++++++++++++------
1 files changed, 14 insertions(+), 6 deletions(-)
diff --git a/src/main/java/com/gitblit/wicket/pages/OverviewPage.java b/src/main/java/com/gitblit/wicket/pages/OverviewPage.java
index 3f5eaa2..e1de9f3 100644
--- a/src/main/java/com/gitblit/wicket/pages/OverviewPage.java
+++ b/src/main/java/com/gitblit/wicket/pages/OverviewPage.java
@@ -34,17 +34,20 @@
import com.gitblit.models.RepositoryModel;
import com.gitblit.models.UserModel;
import com.gitblit.utils.JGitUtils;
+import com.gitblit.wicket.CacheControl;
import com.gitblit.wicket.GitBlitWebSession;
import com.gitblit.wicket.WicketUtils;
+import com.gitblit.wicket.CacheControl.LastModified;
import com.gitblit.wicket.charting.GoogleChart;
import com.gitblit.wicket.charting.GoogleCharts;
import com.gitblit.wicket.charting.GoogleLineChart;
import com.gitblit.wicket.panels.BranchesPanel;
import com.gitblit.wicket.panels.LinkPanel;
-import com.gitblit.wicket.panels.PushesPanel;
+import com.gitblit.wicket.panels.ReflogPanel;
import com.gitblit.wicket.panels.RepositoryUrlPanel;
import com.gitblit.wicket.panels.TagsPanel;
+@CacheControl(LastModified.REPOSITORY)
public class OverviewPage extends RepositoryPage {
public OverviewPage(PageParameters params) {
@@ -78,12 +81,16 @@
private static final long serialVersionUID = 1L;
int counter = 0;
public void populateItem(final Item<String> item) {
- UserModel ownerModel = GitBlit.self().getUserModel(item.getModelObject());
+ String ownername = item.getModelObject();
+ UserModel ownerModel = GitBlit.self().getUserModel(ownername);
if (ownerModel != null) {
item.add(new LinkPanel("owner", null, ownerModel.getDisplayName(), UserPage.class,
WicketUtils.newUsernameParameter(ownerModel.username)).setRenderBodyOnly(true));
} else {
- item.add(new Label("owner").setVisible(false));
+ Label owner = new Label("owner", ownername);
+ WicketUtils.setCssStyle(owner, "text-decoration: line-through;");
+ WicketUtils.setHtmlTooltip(owner, MessageFormat.format(getString("gb.failedToFindAccount"), ownername));
+ item.add(owner);
}
counter++;
item.add(new Label("comma", ",").setVisible(counter < owners.size()));
@@ -94,7 +101,7 @@
add(ownersView);
add(WicketUtils.createTimestampLabel("repositoryLastChange",
- JGitUtils.getLastChange(r), getTimeZone(), getTimeUtils()));
+ JGitUtils.getLastChange(r).when, getTimeZone(), getTimeUtils()));
add(new Label("repositorySize", model.size));
if (metricsTotal == null) {
@@ -109,8 +116,9 @@
add(new RepositoryUrlPanel("repositoryUrlPanel", false, user, model));
- PushesPanel pushes = new PushesPanel("pushesPanel", getRepositoryModel(), r, 10, 0);
- add(pushes);
+ int reflogCount = GitBlit.getInteger(Keys.web.overviewReflogCount, 5);
+ ReflogPanel reflog = new ReflogPanel("reflogPanel", getRepositoryModel(), r, reflogCount, 0);
+ add(reflog);
add(new TagsPanel("tagsPanel", repositoryName, r, numberRefs).hideIfEmpty());
add(new BranchesPanel("branchesPanel", getRepositoryModel(), r, numberRefs, false).hideIfEmpty());
--
Gitblit v1.9.1