Skip to content

The Unified and Autonomous Development Platform

Fix the issue that uploaded image while creating an issue losts after one day

Robin Shen084f7b84ce80
diff --git a/core/src/main/java/io/onedev/server/storage/DefaultAttachmentManager.java b/core/src/main/java/io/onedev/server/storage/DefaultAttachmentManager.java
index 8d9b00f41e..0b8b149d42 100644
--- a/core/src/main/java/io/onedev/server/storage/DefaultAttachmentManager.java
+++ b/core/src/main/java/io/onedev/server/storage/DefaultAttachmentManager.java
@@ -20,6 +20,7 @@ import io.onedev.server.event.entity.EntityRemoved;
import io.onedev.server.event.system.SystemStarted;
import io.onedev.server.event.system.SystemStopping;
import io.onedev.server.model.CodeComment;
+import io.onedev.server.model.Issue;
import io.onedev.server.model.Project;
import io.onedev.server.model.PullRequest;
import io.onedev.server.persistence.TransactionManager;
@@ -137,6 +138,10 @@ public class DefaultAttachmentManager implements AttachmentManager, SchedulableT
CodeComment comment = (CodeComment) event.getEntity();
projectAttachmentDir = storageManager.getProjectAttachmentDir(comment.getProject().getId());
attachmentUUID = comment.getUUID();
+ } else if (event.getEntity() instanceof Issue) {
+ Issue issue = (Issue) event.getEntity();
+ projectAttachmentDir = storageManager.getProjectAttachmentDir(issue.getProject().getId());
+ attachmentUUID = issue.getUUID();
} else {
projectAttachmentDir = null;
attachmentUUID = null;
@@ -165,6 +170,10 @@ public class DefaultAttachmentManager implements AttachmentManager, SchedulableT
CodeComment comment = (CodeComment) event.getEntity();
dirToDelete = getPermanentAttachmentDir(
storageManager.getProjectAttachmentDir(comment.getProject().getId()), comment.getUUID());
+ } else if (event.getEntity() instanceof Issue) {
+ Issue issue = (Issue) event.getEntity();
+ dirToDelete = getPermanentAttachmentDir(
+ storageManager.getProjectAttachmentDir(issue.getProject().getId()), issue.getUUID());
} else {
dirToDelete = null;
}
diff --git a/core/src/main/java/io/onedev/server/web/component/issue/create/NewIssueEditor.java b/core/src/main/java/io/onedev/server/web/component/issue/create/NewIssueEditor.java
index e7056c3d3b..0afe47c864 100644
--- a/core/src/main/java/io/onedev/server/web/component/issue/create/NewIssueEditor.java
+++ b/core/src/main/java/io/onedev/server/web/component/issue/create/NewIssueEditor.java
@@ -6,6 +6,7 @@ import java.util.Date;
import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
+import java.util.UUID;
import javax.annotation.Nullable;
@@ -41,6 +42,8 @@ import io.onedev.server.web.util.ProjectAttachmentSupport;
@SuppressWarnings("serial")
public abstract class NewIssueEditor extends FormComponentPanel<Issue> implements InputContext {
+ private String uuid = UUID.randomUUID().toString();
+
private TextField<String> titleInput;
private CommentInput descriptionInput;
@@ -50,7 +53,7 @@ public abstract class NewIssueEditor extends FormComponentPanel<Issue> implement
private BeanEditor fieldEditor;
public NewIssueEditor(String id) {
- super(id, Model.of(new Issue()));
+ super(id, Model.of((Issue)null));
}
@Override
@@ -151,6 +154,7 @@ public abstract class NewIssueEditor extends FormComponentPanel<Issue> implement
private Issue newIssue() {
Issue issue = new Issue();
+ issue.setUUID(uuid);
issue.setProject(getProject());
issue.setSubmitDate(new Date());
issue.setState(getIssueSetting().getInitialStateSpec().getName());