Fixed bug in receive hook for repositories in subfolders

James Moger

2012-01-05 cb285cbfddfc0b633d6b8cdb4dc0d2bd2b8b51ef

 src/com/gitblit/wicket/pages/DocsPage.java

@@ -27,12 +27,11 @@


import com.gitblit.GitBlit;

import com.gitblit.Keys;

import com.gitblit.models.PathModel;

import com.gitblit.utils.ByteFormat;

import com.gitblit.utils.JGitUtils;

import com.gitblit.wicket.LinkPanel;

import com.gitblit.wicket.RepositoryPage;

import com.gitblit.wicket.WicketUtils;

import com.gitblit.wicket.models.PathModel;

import com.gitblit.wicket.panels.LinkPanel;



public class DocsPage extends RepositoryPage {



@@ -40,30 +39,35 @@
      super(params);



      Repository r = getRepository();

      List<String> extensions = GitBlit.self().settings().getStrings(Keys.web.markdownExtensions);

      List<String> extensions = GitBlit.getStrings(Keys.web.markdownExtensions);

      List<PathModel> paths = JGitUtils.getDocuments(r, extensions);



      final ByteFormat byteFormat = new ByteFormat();



      add(new Label("header", getString("gb.docs")));

		


      // documents list

      ListDataProvider<PathModel> pathsDp = new ListDataProvider<PathModel>(paths);

      DataView<PathModel> pathsView = new DataView<PathModel>("document", pathsDp) {

         private static final long serialVersionUID = 1L;

         int counter = 0;

         int counter;



         public void populateItem(final Item<PathModel> item) {

            PathModel entry = item.getModelObject();

            item.add(WicketUtils.newImage("docIcon", "file_world_16x16.png"));

            item.add(new Label("docSize", byteFormat.format(entry.size)));

            item.add(new LinkPanel("docName", "list", entry.name, BlobPage.class, newPathParameter(entry.path)));

            item.add(new LinkPanel("docName", "list", entry.name, BlobPage.class, WicketUtils

                  .newPathParameter(repositoryName, entry.commitId, entry.path)));



            // links

            item.add(new BookmarkablePageLink<Void>("view", BlobPage.class, WicketUtils.newPathParameter(repositoryName, entry.commitId, entry.path)));

            item.add(new BookmarkablePageLink<Void>("raw", RawPage.class, WicketUtils.newPathParameter(repositoryName, entry.commitId, entry.path)));

            item.add(new BookmarkablePageLink<Void>("blame", BlobPage.class).setEnabled(false));

            item.add(new BookmarkablePageLink<Void>("history", HistoryPage.class, WicketUtils.newPathParameter(repositoryName, entry.commitId, entry.path)));				
            item.add(new BookmarkablePageLink<Void>("view", BlobPage.class, WicketUtils

                  .newPathParameter(repositoryName, entry.commitId, entry.path)));

            item.add(new BookmarkablePageLink<Void>("raw", RawPage.class, WicketUtils

                  .newPathParameter(repositoryName, entry.commitId, entry.path)));

            item.add(new BookmarkablePageLink<Void>("blame", BlamePage.class, WicketUtils

                  .newPathParameter(repositoryName, entry.commitId, entry.path)));

            item.add(new BookmarkablePageLink<Void>("history", HistoryPage.class, WicketUtils

                  .newPathParameter(repositoryName, entry.commitId, entry.path)));

            WicketUtils.setAlternatingBackground(item, counter);

            counter++;

         }