Fixes sort, page building and search functions on "my tickets" page.

Hybris95

2014-04-22 3f5b8f5d9203aa7ffb7fbe9cdbaf9dba3da6cae6

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

@@ -24,7 +24,6 @@
import org.apache.wicket.markup.repeater.Item;

import org.apache.wicket.markup.repeater.data.DataView;

import org.apache.wicket.markup.repeater.data.ListDataProvider;

import org.eclipse.jgit.lib.Constants;

import org.eclipse.jgit.lib.FileMode;

import org.eclipse.jgit.lib.Repository;

import org.eclipse.jgit.revwalk.RevCommit;

@@ -56,8 +55,6 @@
      // tree page links

      add(new BookmarkablePageLink<Void>("historyLink", HistoryPage.class,

            WicketUtils.newPathParameter(repositoryName, objectId, path)));

      add(new BookmarkablePageLink<Void>("headLink", TreePage.class,

            WicketUtils.newPathParameter(repositoryName, Constants.HEAD, path)));

      add(new CompressedDownloadsPanel("compressedLinks", getRequest()

            .getRelativePathPrefixToContextRoot(), repositoryName, objectId, path));



@@ -76,8 +73,8 @@
         paths.add(0, model);

      }



      final String id = getBestCommitId(commit);

      final ByteFormat byteFormat = new ByteFormat();



      final String baseUrl = WicketUtils.getGitblitURL(getRequest());



      // changed paths list

@@ -96,7 +93,7 @@
               item.add(new Label("pathSize", ""));

               item.add(new LinkPanel("pathName", null, entry.name, TreePage.class,

                     WicketUtils

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

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

               item.add(new Label("pathLinks", ""));

            } else {

               if (entry.isTree()) {

@@ -104,16 +101,16 @@
                  item.add(WicketUtils.newImage("pathIcon", "folder_16x16.png"));

                  item.add(new Label("pathSize", ""));

                  item.add(new LinkPanel("pathName", "list", entry.name, TreePage.class,

                        WicketUtils.newPathParameter(repositoryName, entry.commitId,

                        WicketUtils.newPathParameter(repositoryName, id,

                              entry.path)));



                  // links

                  Fragment links = new Fragment("pathLinks", "treeLinks", this);

                  links.add(new BookmarkablePageLink<Void>("tree", TreePage.class,

                        WicketUtils.newPathParameter(repositoryName, entry.commitId,

                        WicketUtils.newPathParameter(repositoryName, id,

                              entry.path)));

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

                        WicketUtils.newPathParameter(repositoryName, entry.commitId,

                        WicketUtils.newPathParameter(repositoryName, id,

                              entry.path)));

                  links.add(new CompressedDownloadsPanel("compressedLinks", baseUrl,

                        repositoryName, objectId, entry.path));

@@ -141,7 +138,7 @@
                        WicketUtils.newPathParameter(submodulePath, submoduleId,

                              "")).setEnabled(hasSubmodule));

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

                        WicketUtils.newPathParameter(repositoryName, entry.commitId,

                        WicketUtils.newPathParameter(repositoryName, id,

                              entry.path)));

                  links.add(new CompressedDownloadsPanel("compressedLinks", baseUrl,

                        submodulePath, submoduleId, "").setEnabled(hasSubmodule));

@@ -157,21 +154,21 @@
                  item.add(WicketUtils.getFileImage("pathIcon", entry.name));

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

                  item.add(new LinkPanel("pathName", "list", displayPath, BlobPage.class,

                        WicketUtils.newPathParameter(repositoryName, entry.commitId,

                        WicketUtils.newPathParameter(repositoryName, id,

                              path)));



                  // links

                  Fragment links = new Fragment("pathLinks", "blobLinks", this);

                  links.add(new BookmarkablePageLink<Void>("view", BlobPage.class,

                        WicketUtils.newPathParameter(repositoryName, entry.commitId,

                        WicketUtils.newPathParameter(repositoryName, id,

                              path)));

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

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

                        .newPathParameter(repositoryName, id, path)));

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

                        WicketUtils.newPathParameter(repositoryName, entry.commitId,

                        WicketUtils.newPathParameter(repositoryName, id,

                              path)));

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

                        WicketUtils.newPathParameter(repositoryName, entry.commitId,

                        WicketUtils.newPathParameter(repositoryName, id,

                              path)));

                  item.add(links);

               }