From a502d96a860456ec5e8c96761db70f7cabb74751 Mon Sep 17 00:00:00 2001
From: Paul Martin <paul@paulsputer.com>
Date: Sat, 30 Apr 2016 04:19:14 -0400
Subject: [PATCH] Merge pull request #1073 from gitblit/1062-DocEditorUpdates
---
src/main/java/com/gitblit/wicket/pages/DocsPage.java | 53 +++++++++++++++++++++++++++++++++++++++--------------
1 files changed, 39 insertions(+), 14 deletions(-)
diff --git a/src/main/java/com/gitblit/wicket/pages/DocsPage.java b/src/main/java/com/gitblit/wicket/pages/DocsPage.java
index 3f9ccdb..5244386 100644
--- a/src/main/java/com/gitblit/wicket/pages/DocsPage.java
+++ b/src/main/java/com/gitblit/wicket/pages/DocsPage.java
@@ -27,14 +27,19 @@
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.StringResourceModel;
+import org.eclipse.jgit.diff.DiffEntry.ChangeType;
import org.eclipse.jgit.lib.Repository;
import org.eclipse.jgit.revwalk.RevCommit;
import com.gitblit.models.PathModel;
+import com.gitblit.models.UserModel;
+import com.gitblit.servlet.RawServlet;
import com.gitblit.utils.ByteFormat;
import com.gitblit.utils.JGitUtils;
import com.gitblit.utils.StringUtils;
import com.gitblit.wicket.CacheControl;
+import com.gitblit.wicket.GitBlitWebSession;
import com.gitblit.wicket.CacheControl.LastModified;
import com.gitblit.wicket.MarkupProcessor;
import com.gitblit.wicket.MarkupProcessor.MarkupDocument;
@@ -48,19 +53,26 @@
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);
+ UserModel currentUser = (GitBlitWebSession.get().getUser() != null) ? GitBlitWebSession.get().getUser() : UserModel.ANONYMOUS;
+ final boolean userCanEdit = currentUser.canEdit(getRepositoryModel());
+
+ RevCommit head = JGitUtils.getCommit(r, objectId);
final String commitId = getBestCommitId(head);
+
List<String> extensions = processor.getAllExtensions();
List<PathModel> paths = JGitUtils.getDocuments(r, extensions);
List<MarkupDocument> roots = processor.getRootDocs(r, repositoryName, commitId);
Fragment fragment = null;
if (roots.isEmpty()) {
- // no identified root documents just show the standard document list
+ // no identified root documents
fragment = new Fragment("docs", "noIndexFragment", this);
+ setResponsePage(NoDocsPage.class, params);
} else {
// root documents, use tabbed ui of index/root and document list
fragment = new Fragment("docs", "tabsFragment", this);
@@ -97,13 +109,18 @@
@Override
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))
+ .setEnabled(userCanEdit));
+
+ // document page links
item.add(new BookmarkablePageLink<Void>("blameLink", BlamePage.class,
WicketUtils.newPathParameter(repositoryName, commitId, doc.documentPath)));
item.add(new BookmarkablePageLink<Void>("historyLink", HistoryPage.class,
WicketUtils.newPathParameter(repositoryName, commitId, doc.documentPath)));
- item.add(new BookmarkablePageLink<Void>("rawLink", RawPage.class, WicketUtils.newPathParameter(
- repositoryName, commitId, doc.documentPath)));
+ String rawUrl = RawServlet.asLink(getContextUrl(), repositoryName, commitId, doc.documentPath);
+ item.add(new ExternalLink("rawLink", rawUrl));
// document content
String file = StringUtils.getLastPathElement(doc.documentPath);
@@ -125,7 +142,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);
@@ -138,18 +154,21 @@
PathModel entry = item.getModelObject();
item.add(WicketUtils.newImage("docIcon", "file_world_16x16.png"));
item.add(new Label("docSize", byteFormat.format(entry.size)));
- item.add(new LinkPanel("docName", "list", entry.name, DocPage.class, WicketUtils
- .newPathParameter(repositoryName, id, entry.path)));
+ item.add(new LinkPanel("docName", "list", StringUtils.stripFileExtension(entry.name),
+ DocPage.class, WicketUtils.newPathParameter(repositoryName, commitId, entry.path)));
// links
item.add(new BookmarkablePageLink<Void>("view", DocPage.class, WicketUtils
- .newPathParameter(repositoryName, id, entry.path)));
- item.add(new BookmarkablePageLink<Void>("raw", RawPage.class, WicketUtils
- .newPathParameter(repositoryName, id, entry.path)));
+ .newPathParameter(repositoryName, commitId, entry.path)));
+ item.add(new BookmarkablePageLink<Void>("edit", EditFilePage.class, WicketUtils
+ .newPathParameter(repositoryName, commitId, entry.path))
+ .setEnabled(userCanEdit));
+ 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++;
}
@@ -163,4 +182,10 @@
protected String getPageName() {
return getString("gb.docs");
}
+
+ @Override
+ protected boolean isCommitPage() {
+ return true;
+ }
+
}
--
Gitblit v1.9.1