Fix submodule links on commit, comitdiff, and tree page (issue-178)

James Moger

2013-01-13 9cc56a1f60eff2ce1db40b7078eab92e78602e1c

Fix submodule links on commit, comitdiff, and tree page (issue-178)

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

@@ -15,14 +15,14 @@
 */
package com.gitblit.wicket.pages;

import java.text.MessageFormat;
import java.util.ArrayList;
import java.util.List;

import java.text.MessageFormat;

import org.apache.wicket.PageParameters;
import org.apache.wicket.markup.html.basic.Label;
import org.apache.wicket.markup.html.link.BookmarkablePageLink;
import org.apache.wicket.markup.html.link.ExternalLink;
import org.apache.wicket.markup.repeater.Item;
import org.apache.wicket.markup.repeater.data.DataView;
import org.apache.wicket.markup.repeater.data.ListDataProvider;
@@ -150,15 +150,12 @@
                // quick links
                if (entry.isSubmodule()) {
                    // submodule
                    item.add(new BookmarkablePageLink<Void>("patch", PatchPage.class, WicketUtils
                            .newPathParameter(submodulePath, entry.objectId, entry.path)).setEnabled(false));
                    item.add(new ExternalLink("patch", "").setEnabled(false));
                    item.add(new BookmarkablePageLink<Void>("view", CommitPage.class, WicketUtils
                            .newObjectParameter(submodulePath, entry.objectId)).setEnabled(hasSubmodule));
                    item.add(new BookmarkablePageLink<Void>("blame", BlamePage.class, WicketUtils
                            .newPathParameter(submodulePath, entry.objectId, entry.path)).setEnabled(false));
                    item.add(new ExternalLink("blame", "").setEnabled(false));
                    item.add(new BookmarkablePageLink<Void>("history", HistoryPage.class, WicketUtils
                            .newPathParameter(submodulePath, entry.objectId, entry.path))
                            .setEnabled(hasSubmodule));
                            .newPathParameter(repositoryName, entry.commitId, entry.path)));
                } else {
                    // tree or blob
                    item.add(new BookmarkablePageLink<Void>("patch", PatchPage.class, WicketUtils

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

@@ -22,6 +22,7 @@
import org.apache.wicket.PageParameters;

import org.apache.wicket.markup.html.basic.Label;

import org.apache.wicket.markup.html.link.BookmarkablePageLink;

import org.apache.wicket.markup.html.link.ExternalLink;

import org.apache.wicket.markup.repeater.Item;

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

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

@@ -184,16 +185,14 @@
                if (entry.isSubmodule()) {

                    // submodule                    

                    item.add(new BookmarkablePageLink<Void>("diff", BlobDiffPage.class, WicketUtils

                            .newPathParameter(submodulePath, entry.objectId, entry.path))

                            .setEnabled(false));

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

                            .setEnabled(!entry.changeType.equals(ChangeType.ADD)));

                    item.add(new BookmarkablePageLink<Void>("view", CommitPage.class, WicketUtils

                            .newObjectParameter(submodulePath, entry.objectId)).setEnabled(hasSubmodule));

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

                            .newPathParameter(submodulePath, entry.objectId, entry.path))

                            .setEnabled(false));

                    item.add(new ExternalLink("blame", "").setEnabled(false));

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

                            .newPathParameter(submodulePath, entry.objectId, entry.path))

                            .setEnabled(hasSubmodule));

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

                            .setEnabled(!entry.changeType.equals(ChangeType.ADD)));

                } else {

                    // tree or blob

                    item.add(new BookmarkablePageLink<Void>("diff", BlobDiffPage.class, WicketUtils


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

@@ -137,8 +137,8 @@
                                WicketUtils.newPathParameter(submodulePath, submoduleId,

                                        "")).setEnabled(hasSubmodule));

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

                                WicketUtils.newPathParameter(submodulePath, submoduleId,

                                        "")).setEnabled(hasSubmodule));

                                WicketUtils.newPathParameter(repositoryName, entry.commitId,

                                        entry.path)));

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

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

                        item.add(links);