Fix for #1042 - Filestore items now shown as icons

Paul Martin

2016-04-06 5bb79fbb553a11e6582392f658233cf58a4ceb11

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

@@ -16,43 +16,28 @@
package com.gitblit.wicket.pages;



import java.io.OutputStream;

import java.sql.Blob;

import java.util.ArrayList;

import java.util.Arrays;

import java.util.List;

import java.util.concurrent.Callable;



import org.apache.wicket.PageParameters;

import org.apache.wicket.behavior.SimpleAttributeModifier;

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

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

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

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

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

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

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.apache.wicket.model.AbstractReadOnlyModel;

import org.apache.wicket.model.IModel;

import org.apache.wicket.model.StringResourceModel;

import org.apache.wicket.request.target.basic.RedirectRequestTarget;

import org.apache.wicket.request.target.resource.ResourceStreamRequestTarget;

import org.apache.wicket.util.resource.AbstractResourceStream;

import org.apache.wicket.util.resource.AbstractResourceStreamWriter;

import org.apache.wicket.util.resource.IResourceStream;

import org.bouncycastle.jcajce.provider.symmetric.Threefish;

import org.eclipse.jgit.diff.DiffEntry.ChangeType;

import org.eclipse.jgit.lib.Repository;

import org.eclipse.jgit.revwalk.RevCommit;



import com.gitblit.Constants;

import com.gitblit.GitBlit;

import com.gitblit.manager.FilestoreManager;

import com.gitblit.manager.GitblitManager;

import com.gitblit.models.FilestoreModel;

import com.gitblit.models.GitNote;

import com.gitblit.models.RepositoryModel;

import com.gitblit.models.PathModel.PathChangeModel;

import com.gitblit.models.SubmoduleModel;

import com.gitblit.models.UserModel;

@@ -185,13 +170,14 @@
         @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);

            item.add(changeType);

            item.add(new DiffStatPanel("diffStat", entry.insertions, entry.deletions, true));

            item.add(WicketUtils.setHtmlTooltip(new Label("filestore", ""), getString("gb.filestore"))

                           .setVisible(entry.isFilestoreItem()));



            boolean hasSubmodule = false;

            String submodulePath = null;

@@ -256,8 +242,6 @@
            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

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

@@ -276,10 +260,6 @@
                           && !entry.changeType.equals(ChangeType.DELETE)));

               

               if (entry.isFilestoreItem()) {

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

						
						
						
                  item.add(new Link<Object>("view", null) {

                      

                     private static final long serialVersionUID = 1L;

@@ -329,8 +309,6 @@
                      }});

                                        

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