Fix for #1031 to display error message

Paul Martin

2016-03-26 932e93f555b0740a449350db6125ad52a4b395c8

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

@@ -35,6 +35,7 @@
import com.gitblit.models.GitNote;

import com.gitblit.models.PathModel.PathChangeModel;

import com.gitblit.models.SubmoduleModel;

import com.gitblit.servlet.RawServlet;

import com.gitblit.utils.JGitUtils;

import com.gitblit.wicket.CacheControl;

import com.gitblit.wicket.CacheControl.LastModified;

@@ -43,7 +44,7 @@
import com.gitblit.wicket.panels.CommitLegendPanel;

import com.gitblit.wicket.panels.CompressedDownloadsPanel;

import com.gitblit.wicket.panels.DiffStatPanel;

import com.gitblit.wicket.panels.GravatarImage;

import com.gitblit.wicket.panels.AvatarImage;

import com.gitblit.wicket.panels.LinkPanel;

import com.gitblit.wicket.panels.RefsPanel;



@@ -132,10 +133,10 @@
            item.add(new RefsPanel("refName", repositoryName, Arrays.asList(entry.notesRef)));

            item.add(createPersonPanel("authorName", entry.notesRef.getAuthorIdent(),

                  Constants.SearchType.AUTHOR));

            item.add(new GravatarImage("noteAuthorAvatar", entry.notesRef.getAuthorIdent()));

            item.add(new AvatarImage("noteAuthorAvatar", entry.notesRef.getAuthorIdent()));

            item.add(WicketUtils.createTimestampLabel("authorDate", entry.notesRef

                  .getAuthorIdent().getWhen(), getTimeZone(), getTimeUtils()));

            item.add(new Label("noteContent", messageProcessor().processPlainCommitMessage(repositoryName,

            item.add(new Label("noteContent", bugtraqProcessor().processPlainCommitMessage(getRepository(), repositoryName,

                  entry.content)).setEscapeModelStrings(false));

         }

      };

@@ -162,6 +163,8 @@
         @Override

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

            final PathChangeModel entry = item.getModelObject();

            final String filestoreItemUrl = entry.isFilestoreItem() ? JGitUtils.getLfsRepositoryUrl(getContextUrl(), repositoryName, entry.getFilestoreOid()) : null;

				
            Label changeType = new Label("changeType", "");

            WicketUtils.setChangeTypeCssClass(changeType, entry.changeType);

            setChangeTypeTooltip(changeType, entry.changeType);

@@ -193,15 +196,21 @@
                  path = JGitUtils.getStringContent(getRepository(), getCommit().getTree(), path);

                  displayPath = entry.path + " -> " + path;

               }

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

                     WicketUtils

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

					
               if (entry.isFilestoreItem()) {

                  item.add(new LinkPanel("pathName", "list", entry.path, filestoreItemUrl));

               } else {

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

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

               }

            }



				


            // quick links

            if (entry.isSubmodule()) {

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



               item.add(new Label("filestore", getString("gb.filestore")).setVisible(false));

               

               // submodule

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

@@ -219,12 +228,22 @@
                     .newPathParameter(repositoryName, entry.commitId, entry.path))

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

                           && !entry.changeType.equals(ChangeType.DELETE)));

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

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

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

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

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

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

					
               if (entry.isFilestoreItem()) {

                  item.add(new Label("filestore", getString("gb.filestore")).setVisible(true));

						
                  item.add(new ExternalLink("view", filestoreItemUrl));

                  item.add(new ExternalLink("raw", filestoreItemUrl));

               } else {

                  item.add(new Label("filestore", getString("gb.filestore")).setVisible(false));

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

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

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

                  String rawUrl = RawServlet.asLink(getContextUrl(), repositoryName, entry.commitId, entry.path);

                  item.add(new ExternalLink("raw", rawUrl)

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

               }

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

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

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

@@ -247,6 +266,11 @@
   }



   @Override

   protected boolean isCommitPage() {

      return true;

   }



   @Override

   protected Class<? extends BasePage> getRepoNavPageClass() {

      return LogPage.class;

   }