Document edit capability via ProseMirror submodule #974

Paul Martin

2016-01-11 2754961708ff0eb6030faf6db2edf8fbdae227d5

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

@@ -49,11 +49,14 @@
   public DocsPage(PageParameters params) {

      super(params);



      MarkupProcessor processor = new MarkupProcessor(app().settings());

      String objectId = WicketUtils.getObject(params);



      MarkupProcessor processor = new MarkupProcessor(app().settings(), app().xssFilter());



      Repository r = getRepository();

      RevCommit head = JGitUtils.getCommit(r, null);

      RevCommit head = JGitUtils.getCommit(r, objectId);

      final String commitId = getBestCommitId(head);



      List<String> extensions = processor.getAllExtensions();

      List<PathModel> paths = JGitUtils.getDocuments(r, extensions);



@@ -100,6 +103,8 @@
            public void populateItem(final Item<MarkupDocument> item) {

               MarkupDocument doc = item.getModelObject();

               // document page links

               item.add(new BookmarkablePageLink<Void>("editLink", EditFilePage.class,

                     WicketUtils.newPathParameter(repositoryName, commitId, doc.documentPath)));

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

                     WicketUtils.newPathParameter(repositoryName, commitId, doc.documentPath)));

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

@@ -127,7 +132,6 @@
      }



      // document list

      final String id = getBestCommitId(head);

      final ByteFormat byteFormat = new ByteFormat();

      Fragment docs = new Fragment("documents", "documentsFragment", this);

      ListDataProvider<PathModel> pathsDp = new ListDataProvider<PathModel>(paths);

@@ -141,17 +145,19 @@
            item.add(WicketUtils.newImage("docIcon", "file_world_16x16.png"));

            item.add(new Label("docSize", byteFormat.format(entry.size)));

            item.add(new LinkPanel("docName", "list", StringUtils.stripFileExtension(entry.name),

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

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



            // links

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

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

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

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

            item.add(new BookmarkablePageLink<Void>("edit", EditFilePage.class, WicketUtils

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

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

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

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

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

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

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

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

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

            WicketUtils.setAlternatingBackground(item, counter);

            counter++;

         }

@@ -165,4 +171,10 @@
   protected String getPageName() {

      return getString("gb.docs");

   }



   @Override

   protected boolean isCommitPage() {

      return true;

   }



}