Skip to content

The Unified and Autonomous Development Platform

Able to select and insert most recent files while editing a markdown

robin shen4f6b4744f2b8
diff --git a/core/src/main/java/com/gitplex/server/model/Project.java b/core/src/main/java/com/gitplex/server/model/Project.java
index 2e07cd1a04..c9dbbb7b0f 100644
--- a/core/src/main/java/com/gitplex/server/model/Project.java
+++ b/core/src/main/java/com/gitplex/server/model/Project.java
@@ -781,9 +781,13 @@ public class Project extends AbstractEntity {
}
public List<BlobIdent> getChildren(BlobIdent blobIdent, BlobIdentFilter blobIdentFilter) {
+ return getChildren(blobIdent, blobIdentFilter, getObjectId(blobIdent.revision));
+ }
+
+ public List<BlobIdent> getChildren(BlobIdent blobIdent, BlobIdentFilter blobIdentFilter, ObjectId commitId) {
Repository repository = getRepository();
try (RevWalk revWalk = new RevWalk(repository)) {
- RevTree revTree = revWalk.parseCommit(getObjectId(blobIdent.revision)).getTree();
+ RevTree revTree = revWalk.parseCommit(commitId).getTree();
TreeWalk treeWalk;
if (blobIdent.path != null) {
diff --git a/web/src/main/java/com/gitplex/server/web/component/markdown/InsertUrlPanel.java b/web/src/main/java/com/gitplex/server/web/component/markdown/InsertUrlPanel.java
index 7b20ae4fe3..494164e549 100644
--- a/web/src/main/java/com/gitplex/server/web/component/markdown/InsertUrlPanel.java
+++ b/web/src/main/java/com/gitplex/server/web/component/markdown/InsertUrlPanel.java
@@ -35,6 +35,7 @@ import org.apache.wicket.model.Model;
import org.apache.wicket.request.cycle.RequestCycle;
import org.apache.wicket.util.lang.Bytes;
import org.eclipse.jgit.lib.FileMode;
+import org.eclipse.jgit.lib.ObjectId;
import com.gitplex.server.git.BlobIdent;
import com.gitplex.server.git.BlobIdentFilter;
@@ -150,6 +151,13 @@ class InsertUrlPanel extends Panel {
@Override
protected Component newContent(String id, FloatingPanel dropdown) {
+ ObjectId commitId;
+ try {
+ commitId = blobReferenceSupport.getProject().getRepository()
+ .resolve(blobReferenceSupport.getRevision());
+ } catch (IOException e) {
+ throw new RuntimeException(e);
+ }
return new ProjectFilePicker(id, new AbstractReadOnlyModel<Project>() {
@Override
@@ -157,15 +165,22 @@ class InsertUrlPanel extends Panel {
return blobReferenceSupport.getProject();
}
- }, blobReferenceSupport.getRevision()) {
+ }, blobReferenceSupport.getRevision(), commitId) {
@Override
protected void onSelect(AjaxRequestTarget target, BlobIdent blobIdent) {
String baseUrl = markdownEditor.getBaseUrl();
String referenceUrl = urlFor(ProjectBlobPage.class,
ProjectBlobPage.paramsOf(blobReferenceSupport.getProject(), blobIdent)).toString();
- String relativized = PathUtils.relativize(baseUrl, referenceUrl);
- String relativePath = relativized.toString().substring("../".length());
+ String relativized = PathUtils.relativize(baseUrl, referenceUrl);
+ String relativePath;
+ if (relativized.length() != 0) {
+ relativePath = relativized.toString().substring("../".length());
+ } else if (baseUrl.contains("/")) {
+ relativePath = StringUtils.substringAfterLast(baseUrl, "/");
+ } else {
+ relativePath = baseUrl;
+ }
markdownEditor.insertUrl(target, isImage, relativePath, blobIdent.getName(), null);
markdownEditor.closeUrlInserter(target, InsertUrlPanel.this);
dropdown.close();
diff --git a/web/src/main/java/com/gitplex/server/web/component/projectfilepicker/ProjectFilePicker.java b/web/src/main/java/com/gitplex/server/web/component/projectfilepicker/ProjectFilePicker.java
index 770f94076a..163ff73990 100644
--- a/web/src/main/java/com/gitplex/server/web/component/projectfilepicker/ProjectFilePicker.java
+++ b/web/src/main/java/com/gitplex/server/web/component/projectfilepicker/ProjectFilePicker.java
@@ -17,6 +17,7 @@ import org.apache.wicket.markup.html.panel.GenericPanel;
import org.apache.wicket.model.IModel;
import org.apache.wicket.model.Model;
import org.eclipse.jgit.lib.FileMode;
+import org.eclipse.jgit.lib.ObjectId;
import com.gitplex.server.git.BlobIdent;
import com.gitplex.server.git.BlobIdentFilter;
@@ -29,11 +30,18 @@ public abstract class ProjectFilePicker extends GenericPanel<Project> {
private final String revision;
+ private final ObjectId commitId;
+
public ProjectFilePicker(String id, IModel<Project> projectModel, String revision) {
+ this(id, projectModel, revision, projectModel.getObject().getObjectId(revision));
+ }
+
+ public ProjectFilePicker(String id, IModel<Project> projectModel, String revision, ObjectId commitId) {
super(id, projectModel);
this.revision = revision;
+ this.commitId = commitId;
}
-
+
@Override
protected void onInitialize() {
super.onInitialize();
@@ -56,7 +64,7 @@ public abstract class ProjectFilePicker extends GenericPanel<Project> {
@Override
public Iterator<? extends BlobIdent> getChildren(BlobIdent node) {
- return getModelObject().getChildren(node, getBlobIdentFilter()).iterator();
+ return getModelObject().getChildren(node, getBlobIdentFilter(), commitId).iterator();
}
@Override
@@ -76,7 +84,8 @@ public abstract class ProjectFilePicker extends GenericPanel<Project> {
public void expand(BlobIdent blobIdent) {
super.expand(blobIdent);
- List<BlobIdent> children = ProjectFilePicker.this.getModelObject().getChildren(blobIdent, getBlobIdentFilter());
+ List<BlobIdent> children = ProjectFilePicker.this.getModelObject().getChildren(blobIdent,
+ getBlobIdentFilter(), commitId);
if (children.size() == 1 && children.get(0).isTree())
expand(children.get(0));
}