From f76fee63ed9cb3a30d3c0c092d860b1cb93a481b Mon Sep 17 00:00:00 2001 From: Gerard Smyth <gerard.smyth@gmail.com> Date: Thu, 08 May 2014 13:09:30 -0400 Subject: [PATCH] Updated the SyndicationServlet to provide an additional option to return details of the tags in the repository instead of the commits. This uses a new 'ot' request parameter to indicate the object type of the content to return, which can be ither TAG or COMMIT. If this is not provided, then COMMIT is assumed to maintain backwards compatability. If tags are returned, then the paging parameters, 'l' and 'pg' are still supported, but searching options are currently ignored. --- src/main/java/com/gitblit/wicket/pages/OverviewPage.java | 49 +++++++++++++++++++++++++++++-------------------- 1 files changed, 29 insertions(+), 20 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..1979f97 100644 --- a/src/main/java/com/gitblit/wicket/pages/OverviewPage.java +++ b/src/main/java/com/gitblit/wicket/pages/OverviewPage.java @@ -28,29 +28,31 @@ import org.apache.wicket.markup.repeater.data.ListDataProvider; import org.eclipse.jgit.lib.Repository; -import com.gitblit.GitBlit; import com.gitblit.Keys; import com.gitblit.models.Metric; import com.gitblit.models.RepositoryModel; import com.gitblit.models.UserModel; import com.gitblit.utils.JGitUtils; +import com.gitblit.wicket.CacheControl; +import com.gitblit.wicket.CacheControl.LastModified; import com.gitblit.wicket.GitBlitWebSession; import com.gitblit.wicket.WicketUtils; -import com.gitblit.wicket.charting.GoogleChart; -import com.gitblit.wicket.charting.GoogleCharts; -import com.gitblit.wicket.charting.GoogleLineChart; +import com.gitblit.wicket.charting.Chart; +import com.gitblit.wicket.charting.Charts; +import com.gitblit.wicket.charting.Flotr2Charts; 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) { super(params); - int numberRefs = GitBlit.getInteger(Keys.web.summaryRefsCount, 5); + int numberRefs = app().settings().getInteger(Keys.web.summaryRefsCount, 5); Repository r = getRepository(); final RepositoryModel model = getRepositoryModel(); @@ -61,8 +63,8 @@ List<Metric> metrics = null; Metric metricsTotal = null; - if (!model.skipSummaryMetrics && GitBlit.getBoolean(Keys.web.generateActivityGraph, true)) { - metrics = GitBlit.self().getRepositoryDefaultMetrics(model, r); + if (!model.skipSummaryMetrics && app().settings().getBoolean(Keys.web.generateActivityGraph, true)) { + metrics = app().repositories().getRepositoryDefaultMetrics(model, r); metricsTotal = metrics.remove(0); } @@ -70,20 +72,25 @@ // repository description add(new Label("repositoryDescription", getRepositoryModel().description)); - + // owner links final List<String> owners = new ArrayList<String>(getRepositoryModel().owners); ListDataProvider<String> ownersDp = new ListDataProvider<String>(owners); DataView<String> ownersView = new DataView<String>("repositoryOwners", ownersDp) { private static final long serialVersionUID = 1L; int counter = 0; + @Override public void populateItem(final Item<String> item) { - UserModel ownerModel = GitBlit.self().getUserModel(item.getModelObject()); + String ownername = item.getModelObject(); + UserModel ownerModel = app().users().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())); @@ -92,11 +99,11 @@ }; ownersView.setRenderBodyOnly(true); 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) { add(new Label("branchStats", "")); } else { @@ -109,8 +116,9 @@ add(new RepositoryUrlPanel("repositoryUrlPanel", false, user, model)); - PushesPanel pushes = new PushesPanel("pushesPanel", getRepositoryModel(), r, 10, 0); - add(pushes); + int reflogCount = app().settings().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()); @@ -125,18 +133,19 @@ private void insertActivityGraph(List<Metric> metrics) { if ((metrics != null) && (metrics.size() > 0) - && GitBlit.getBoolean(Keys.web.generateActivityGraph, true)) { + && app().settings().getBoolean(Keys.web.generateActivityGraph, true)) { + + Charts charts = new Flotr2Charts(); // daily line chart - GoogleChart chart = new GoogleLineChart("chartDaily", "", "unit", + Chart chart = charts.createLineChart("chartDaily", "", "unit", getString("gb.commits")); for (Metric metric : metrics) { chart.addValue(metric.name, metric.count); } chart.setWidth(375); chart.setHeight(150); - - GoogleCharts charts = new GoogleCharts(); + charts.addChart(chart); add(new HeaderContributor(charts)); } -- Gitblit v1.9.1