Add pull request linking in changelog to generated documentation

James Moger

2013-11-22 3daba4304dba818d54eb9b74d8d35df5aab8fee5

 src/main/java/com/gitblit/wicket/pages/OverviewPage.java

@@ -34,6 +34,8 @@
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;

@@ -41,10 +43,11 @@
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) {

@@ -70,20 +73,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 = 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()));

@@ -92,11 +100,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,9 +117,9 @@


      add(new RepositoryUrlPanel("repositoryUrlPanel", false, user, model));



      int pushCount = GitBlit.getInteger(Keys.web.overviewPushCount, 5);

      PushesPanel pushes = new PushesPanel("pushesPanel", getRepositoryModel(), r, pushCount, 0, false);

      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());



@@ -127,7 +135,7 @@
   private void insertActivityGraph(List<Metric> metrics) {

      if ((metrics != null) && (metrics.size() > 0)

            && GitBlit.getBoolean(Keys.web.generateActivityGraph, true)) {

			


         // daily line chart

         GoogleChart chart = new GoogleLineChart("chartDaily", "", "unit",

               getString("gb.commits"));

@@ -136,7 +144,7 @@
         }

         chart.setWidth(375);

         chart.setHeight(150);

			


         GoogleCharts charts = new GoogleCharts();

         charts.addChart(chart);

         add(new HeaderContributor(charts));