Remove artifact setting from manager dialog

James Moger

2013-11-26 4fcac9d2cbdafb51e3ee9ca3b3da64fd86103174

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

@@ -21,16 +21,17 @@
import org.eclipse.jgit.lib.Repository;

import org.eclipse.jgit.revwalk.RevCommit;



import com.gitblit.GitBlit;

import com.gitblit.Keys;

import com.gitblit.utils.DiffUtils;

import com.gitblit.utils.DiffUtils.DiffOutputType;

import com.gitblit.utils.JGitUtils;

import com.gitblit.utils.StringUtils;

import com.gitblit.wicket.CacheControl;

import com.gitblit.wicket.CacheControl.LastModified;

import com.gitblit.wicket.WicketUtils;

import com.gitblit.wicket.panels.CommitHeaderPanel;

import com.gitblit.wicket.panels.PathBreadcrumbsPanel;



@CacheControl(LastModified.BOOT)

public class BlobDiffPage extends RepositoryPage {



   public BlobDiffPage(PageParameters params) {

@@ -42,19 +43,16 @@
      Repository r = getRepository();

      RevCommit commit = getCommit();



      DiffOutputType diffType = DiffOutputType.forName(GitBlit.getString(Keys.web.diffStyle,

            DiffOutputType.GITBLIT.name()));



      String diff;

      if (StringUtils.isEmpty(baseObjectId)) {

         // use first parent

         diff = DiffUtils.getDiff(r, commit, blobPath, diffType);

         diff = DiffUtils.getDiff(r, commit, blobPath, DiffOutputType.HTML).content;

         add(new BookmarkablePageLink<Void>("patchLink", PatchPage.class,

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

      } else {

         // base commit specified

         RevCommit baseCommit = JGitUtils.getCommit(r, baseObjectId);

         diff = DiffUtils.getDiff(r, baseCommit, commit, blobPath, diffType);

         diff = DiffUtils.getDiff(r, baseCommit, commit, blobPath, DiffOutputType.HTML).content;

         add(new BookmarkablePageLink<Void>("patchLink", PatchPage.class,

               WicketUtils.newBlobDiffParameter(repositoryName, baseObjectId, objectId,

                     blobPath)));

@@ -82,7 +80,7 @@
   protected String getPageName() {

      return getString("gb.diff");

   }

	


   @Override

   protected Class<? extends BasePage> getRepoNavPageClass() {

      return TreePage.class;