Remove artifact setting from manager dialog

James Moger

2013-11-26 4fcac9d2cbdafb51e3ee9ca3b3da64fd86103174

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

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

      }



      final String id = getBestCommitId(commit);

      final ByteFormat byteFormat = new ByteFormat();



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



      // changed paths list

@@ -86,6 +86,7 @@
         private static final long serialVersionUID = 1L;

         int counter;



         @Override

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

            PathModel entry = item.getModelObject();

            item.add(new Label("pathPermissions", JGitUtils.getPermissionsFromMode(entry.mode)));

@@ -95,7 +96,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()) {

@@ -103,36 +104,36 @@
                  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,

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

                              entry.path)));

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

                        repositoryName, objectId, entry.path));



                  item.add(links);

               } else if (entry.isSubmodule()) {

                  // submodule

                  String submoduleId = entry.objectId;						
                  String submoduleId = entry.objectId;

                  String submodulePath;

                  boolean hasSubmodule = false;

                  SubmoduleModel submodule = getSubmodule(entry.path);

                  submodulePath = submodule.gitblitPath;

                  hasSubmodule = submodule.hasSubmodule;

						


                  item.add(WicketUtils.newImage("pathIcon", "git-orange-16x16.png"));

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

                  item.add(new LinkPanel("pathName", "list", entry.name + " @ " + 
                  item.add(new LinkPanel("pathName", "list", entry.name + " @ " +

                        getShortObjectId(submoduleId), TreePage.class,

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

						


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

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

                        WicketUtils.newRepositoryParameter(submodulePath)).setEnabled(hasSubmodule));

@@ -140,11 +141,11 @@
                        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));

                  item.add(links);						
                  item.add(links);

               } else {

                  // blob link

                  String displayPath = entry.name;

@@ -156,21 +157,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);

               }