@@ -175,9 +175,9 @@ public class GitBlitWebApp extends WebApplication implements GitblitWicketApp { | |||
// setup the standard gitweb-ish urls | |||
mount("/repositories", RepositoriesPage.class); | |||
mount("/overview", OverviewPage.class, "r", "h"); | |||
mount("/overview", OverviewPage.class, "r"); | |||
mount("/summary", SummaryPage.class, "r"); | |||
mount("/reflog", ReflogPage.class, "r", "h"); | |||
mount("/reflog", ReflogPage.class, "r"); | |||
mount("/commits", LogPage.class, "r", "h"); | |||
mount("/log", LogPage.class, "r", "h"); | |||
mount("/tags", TagsPage.class, "r"); |
@@ -234,6 +234,11 @@ public class BlamePage extends RepositoryPage { | |||
return getString("gb.blame"); | |||
} | |||
@Override | |||
protected boolean isCommitPage() { | |||
return true; | |||
} | |||
@Override | |||
protected Class<? extends BasePage> getRepoNavPageClass() { | |||
return TreePage.class; |
@@ -81,6 +81,11 @@ public class BlobDiffPage extends RepositoryPage { | |||
return getString("gb.diff"); | |||
} | |||
@Override | |||
protected boolean isCommitPage() { | |||
return true; | |||
} | |||
@Override | |||
protected Class<? extends BasePage> getRepoNavPageClass() { | |||
return TreePage.class; |
@@ -223,6 +223,11 @@ public class BlobPage extends RepositoryPage { | |||
return getString("gb.view"); | |||
} | |||
@Override | |||
protected boolean isCommitPage() { | |||
return true; | |||
} | |||
@Override | |||
protected Class<? extends BasePage> getRepoNavPageClass() { | |||
return TreePage.class; |
@@ -196,6 +196,11 @@ public class CommitDiffPage extends RepositoryPage { | |||
return getString("gb.commitdiff"); | |||
} | |||
@Override | |||
protected boolean isCommitPage() { | |||
return true; | |||
} | |||
@Override | |||
protected Class<? extends BasePage> getRepoNavPageClass() { | |||
return LogPage.class; |
@@ -247,6 +247,11 @@ public class CommitPage extends RepositoryPage { | |||
return getString("gb.commit"); | |||
} | |||
@Override | |||
protected boolean isCommitPage() { | |||
return true; | |||
} | |||
@Override | |||
protected Class<? extends BasePage> getRepoNavPageClass() { | |||
return LogPage.class; |
@@ -101,6 +101,11 @@ public class DocPage extends RepositoryPage { | |||
return getString("gb.docs"); | |||
} | |||
@Override | |||
protected boolean isCommitPage() { | |||
return true; | |||
} | |||
@Override | |||
protected Class<? extends BasePage> getRepoNavPageClass() { | |||
return DocsPage.class; |
@@ -167,4 +167,10 @@ public class DocsPage extends RepositoryPage { | |||
protected String getPageName() { | |||
return getString("gb.docs"); | |||
} | |||
@Override | |||
protected boolean isCommitPage() { | |||
return true; | |||
} | |||
} |
@@ -66,6 +66,11 @@ public class HistoryPage extends RepositoryPage { | |||
return getString("gb.history"); | |||
} | |||
@Override | |||
protected boolean isCommitPage() { | |||
return true; | |||
} | |||
@Override | |||
protected Class<? extends BasePage> getRepoNavPageClass() { | |||
return TreePage.class; |
@@ -69,4 +69,10 @@ public class LogPage extends RepositoryPage { | |||
protected String getPageName() { | |||
return getString("gb.log"); | |||
} | |||
@Override | |||
protected boolean isCommitPage() { | |||
return true; | |||
} | |||
} |
@@ -61,24 +61,24 @@ public class MetricsPage extends RepositoryPage { | |||
MessageFormat.format(getString("gb.branchStats"), metricsTotal.count, | |||
metricsTotal.tag, getTimeUtils().duration(metricsTotal.duration)))); | |||
} | |||
Charts charts = new Flotr2Charts(); | |||
add(WicketUtils.newBlankImage("commitsChart")); | |||
add(WicketUtils.newBlankImage("dayOfWeekChart")); | |||
add(WicketUtils.newBlankImage("authorsChart")); | |||
createLineChart(charts, "commitsChart", metrics); | |||
createBarChart(charts, "dayOfWeekChart", getDayOfWeekMetrics(r, objectId)); | |||
createPieChart(charts, "authorsChart", getAuthorMetrics(r, objectId)); | |||
add(new HeaderContributor(charts)); | |||
} | |||
private void createLineChart(Charts charts, String id, List<Metric> metrics) { | |||
if ((metrics != null) && (metrics.size() > 0)) { | |||
Chart chart = charts.createLineChart(id, "", "day", | |||
getString("gb.commits")); | |||
SimpleDateFormat df = new SimpleDateFormat("yyyy-MM-dd"); | |||
@@ -102,22 +102,22 @@ public class MetricsPage extends RepositoryPage { | |||
chart.addHighlight(date, (int)metric.count); | |||
} | |||
} | |||
charts.addChart(chart); | |||
charts.addChart(chart); | |||
} | |||
} | |||
private void createPieChart(Charts charts, String id, List<Metric> metrics) { | |||
if ((metrics != null) && (metrics.size() > 0)) { | |||
Chart chart = charts.createPieChart(id, "", "day", | |||
getString("gb.commits")); | |||
for (Metric metric : metrics) { | |||
chart.addValue(metric.name, (int)metric.count); | |||
} | |||
charts.addChart(chart); | |||
charts.addChart(chart); | |||
} | |||
} | |||
private void createBarChart(Charts charts, String id, List<Metric> metrics) { | |||
if ((metrics != null) && (metrics.size() > 0)) { | |||
Chart chart = charts.createBarChart(id, "", "day", | |||
@@ -125,7 +125,7 @@ public class MetricsPage extends RepositoryPage { | |||
for (Metric metric : metrics) { | |||
chart.addValue(metric.name, (int)metric.count); | |||
} | |||
charts.addChart(chart); | |||
charts.addChart(chart); | |||
} | |||
} | |||
@@ -178,6 +178,11 @@ public class MetricsPage extends RepositoryPage { | |||
return getString("gb.metrics"); | |||
} | |||
@Override | |||
protected boolean isCommitPage() { | |||
return true; | |||
} | |||
@Override | |||
protected Class<? extends BasePage> getRepoNavPageClass() { | |||
return SummaryPage.class; |
@@ -32,6 +32,11 @@ public class NoDocsPage extends RepositoryPage { | |||
return getString("gb.docs"); | |||
} | |||
@Override | |||
protected boolean isCommitPage() { | |||
return true; | |||
} | |||
@Override | |||
protected Class<? extends BasePage> getRepoNavPageClass() { | |||
return DocsPage.class; |
@@ -201,11 +201,13 @@ public abstract class RepositoryPage extends RootPage { | |||
objectParams = params; | |||
// preserve the objectid iff the objectid directly (or indirectly) refers to a ref | |||
if (!StringUtils.isEmpty(objectId)) { | |||
if (isCommitPage() && !StringUtils.isEmpty(objectId)) { | |||
RevCommit commit = JGitUtils.getCommit(r, objectId); | |||
String bestId = getBestCommitId(commit); | |||
if (!commit.getName().equals(bestId)) { | |||
objectParams = WicketUtils.newObjectParameter(getRepositoryName(), bestId); | |||
if (commit != null) { | |||
String bestId = getBestCommitId(commit); | |||
if (!commit.getName().equals(bestId)) { | |||
objectParams = WicketUtils.newObjectParameter(getRepositoryName(), bestId); | |||
} | |||
} | |||
} | |||
} | |||
@@ -574,6 +576,10 @@ public abstract class RepositoryPage extends RootPage { | |||
protected abstract String getPageName(); | |||
protected boolean isCommitPage() { | |||
return false; | |||
} | |||
protected Component createPersonPanel(String wicketId, PersonIdent identity, | |||
Constants.SearchType searchType) { | |||
String name = identity == null ? "" : identity.getName(); |
@@ -100,6 +100,11 @@ public class TagPage extends RepositoryPage { | |||
return getString("gb.tag"); | |||
} | |||
@Override | |||
protected boolean isCommitPage() { | |||
return true; | |||
} | |||
@Override | |||
protected Class<? extends BasePage> getRepoNavPageClass() { | |||
return LogPage.class; |
@@ -186,4 +186,10 @@ public class TreePage extends RepositoryPage { | |||
protected String getPageName() { | |||
return getString("gb.tree"); | |||
} | |||
@Override | |||
protected boolean isCommitPage() { | |||
return true; | |||
} | |||
} |