The Unified and Autonomous Development Platform
Add diff panel to diff simple string list.
robin shena89f1b3e3978
diff --git a/core/src/main/java/io/onedev/server/CoreModule.java b/core/src/main/java/io/onedev/server/CoreModule.javaindex 68b1c85fc1..5ffc6312cb 100644--- a/core/src/main/java/io/onedev/server/CoreModule.java+++ b/core/src/main/java/io/onedev/server/CoreModule.java@@ -92,7 +92,7 @@ import io.onedev.server.manager.ConfigManager;import io.onedev.server.manager.DataManager;import io.onedev.server.manager.GroupAuthorizationManager;import io.onedev.server.manager.GroupManager;-import io.onedev.server.manager.IssueActivityManager;+import io.onedev.server.manager.IssueCommentManager;import io.onedev.server.manager.IssueRelationManager;import io.onedev.server.manager.IssueFieldManager;import io.onedev.server.manager.IssueManager;@@ -130,7 +130,7 @@ import io.onedev.server.manager.impl.DefaultConfigManager;import io.onedev.server.manager.impl.DefaultDataManager;import io.onedev.server.manager.impl.DefaultGroupAuthorizationManager;import io.onedev.server.manager.impl.DefaultGroupManager;-import io.onedev.server.manager.impl.DefaultIssueActivityManager;+import io.onedev.server.manager.impl.DefaultIssueCommentManager;import io.onedev.server.manager.impl.DefaultIssueRelationManager;import io.onedev.server.manager.impl.DefaultIssueFieldManager;import io.onedev.server.manager.impl.DefaultIssueManager;@@ -315,7 +315,7 @@ public class CoreModule extends AbstractPluginModule {bind(EntityManager.class).toProvider(SessionProvider.class);bind(SessionFactory.class).toProvider(SessionFactoryProvider.class);bind(EntityManagerFactory.class).toProvider(SessionFactoryProvider.class);- bind(IssueActivityManager.class).to(DefaultIssueActivityManager.class);+ bind(IssueCommentManager.class).to(DefaultIssueCommentManager.class);contribute(ObjectMapperConfigurator.class, GitObjectMapperConfigurator.class);contribute(ObjectMapperConfigurator.class, HibernateObjectMapperConfigurator.class);diff --git a/core/src/main/java/io/onedev/server/manager/IssueActivityManager.java b/core/src/main/java/io/onedev/server/manager/IssueActivityManager.javadeleted file mode 100644index fa41021072..0000000000--- a/core/src/main/java/io/onedev/server/manager/IssueActivityManager.java+++ /dev/null@@ -1,8 +0,0 @@-package io.onedev.server.manager;--import io.onedev.server.model.IssueActivity;-import io.onedev.server.persistence.dao.EntityManager;--public interface IssueActivityManager extends EntityManager<IssueActivity> {--}diff --git a/core/src/main/java/io/onedev/server/manager/IssueCommentManager.java b/core/src/main/java/io/onedev/server/manager/IssueCommentManager.javanew file mode 100644index 0000000000..3deddda3fc--- /dev/null+++ b/core/src/main/java/io/onedev/server/manager/IssueCommentManager.java@@ -0,0 +1,8 @@+package io.onedev.server.manager;++import io.onedev.server.model.IssueComment;+import io.onedev.server.persistence.dao.EntityManager;++public interface IssueCommentManager extends EntityManager<IssueComment> {++}diff --git a/core/src/main/java/io/onedev/server/manager/VisitManager.java b/core/src/main/java/io/onedev/server/manager/VisitManager.javaindex 4b49f30b95..0ae943b802 100644--- a/core/src/main/java/io/onedev/server/manager/VisitManager.java+++ b/core/src/main/java/io/onedev/server/manager/VisitManager.java@@ -5,6 +5,7 @@ import java.util.Date;import javax.annotation.Nullable;import io.onedev.server.model.CodeComment;+import io.onedev.server.model.Issue;import io.onedev.server.model.PullRequest;import io.onedev.server.model.User;@@ -14,8 +15,13 @@ public interface VisitManager {void visitPullRequestCodeComments(User user, PullRequest request);+ void visitIssue(User user, Issue issue);+void visitCodeComment(User user, CodeComment comment);+ @Nullable+ Date getIssueVisitDate(User user, Issue issue);+@NullableDate getPullRequestVisitDate(User user, PullRequest request);diff --git a/core/src/main/java/io/onedev/server/manager/impl/DefaultIssueActivityManager.java b/core/src/main/java/io/onedev/server/manager/impl/DefaultIssueActivityManager.javadeleted file mode 100644index 841c4fd293..0000000000--- a/core/src/main/java/io/onedev/server/manager/impl/DefaultIssueActivityManager.java+++ /dev/null@@ -1,20 +0,0 @@-package io.onedev.server.manager.impl;--import javax.inject.Inject;-import javax.inject.Singleton;--import io.onedev.server.manager.IssueActivityManager;-import io.onedev.server.model.IssueActivity;-import io.onedev.server.persistence.dao.AbstractEntityManager;-import io.onedev.server.persistence.dao.Dao;--@Singleton-public class DefaultIssueActivityManager extends AbstractEntityManager<IssueActivity>- implements IssueActivityManager {-- @Inject- public DefaultIssueActivityManager(Dao dao) {- super(dao);- }--}diff --git a/core/src/main/java/io/onedev/server/manager/impl/DefaultIssueCommentManager.java b/core/src/main/java/io/onedev/server/manager/impl/DefaultIssueCommentManager.javanew file mode 100644index 0000000000..7a1c956292--- /dev/null+++ b/core/src/main/java/io/onedev/server/manager/impl/DefaultIssueCommentManager.java@@ -0,0 +1,20 @@+package io.onedev.server.manager.impl;++import javax.inject.Inject;+import javax.inject.Singleton;++import io.onedev.server.manager.IssueCommentManager;+import io.onedev.server.model.IssueComment;+import io.onedev.server.persistence.dao.AbstractEntityManager;+import io.onedev.server.persistence.dao.Dao;++@Singleton+public class DefaultIssueCommentManager extends AbstractEntityManager<IssueComment>+ implements IssueCommentManager {++ @Inject+ public DefaultIssueCommentManager(Dao dao) {+ super(dao);+ }++}diff --git a/core/src/main/java/io/onedev/server/manager/impl/DefaultPullRequestReferenceManager.java b/core/src/main/java/io/onedev/server/manager/impl/DefaultPullRequestReferenceManager.javaindex 75f04602b9..ea0fbe68ca 100644--- a/core/src/main/java/io/onedev/server/manager/impl/DefaultPullRequestReferenceManager.java+++ b/core/src/main/java/io/onedev/server/manager/impl/DefaultPullRequestReferenceManager.java@@ -45,7 +45,7 @@ public class DefaultPullRequestReferenceManager extends AbstractEntityManager<Puif (markdown != null) {String rendered = markdownManager.render(markdown);- for (PullRequest referenced: new PullRequestParser().parseRequests(event.getRequest().getTargetProject(), rendered)) {+ for (PullRequest referenced: new PullRequestParser().parseReferences(event.getRequest().getTargetProject(), rendered)) {if (!referenced.equals(event.getRequest())) {EntityCriteria<PullRequestReference> criteria = EntityCriteria.of(PullRequestReference.class);criteria.add(Restrictions.eq("referenced", referenced));diff --git a/core/src/main/java/io/onedev/server/manager/impl/DefaultVisitManager.java b/core/src/main/java/io/onedev/server/manager/impl/DefaultVisitManager.javaindex e2c3850f29..075407b1a6 100644--- a/core/src/main/java/io/onedev/server/manager/impl/DefaultVisitManager.java+++ b/core/src/main/java/io/onedev/server/manager/impl/DefaultVisitManager.java@@ -15,6 +15,7 @@ import io.onedev.server.event.pullrequest.PullRequestStatusChangeEvent;import io.onedev.server.manager.StorageManager;import io.onedev.server.manager.VisitManager;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.model.User;@@ -30,7 +31,7 @@ import jetbrains.exodus.env.TransactionalExecutable;@Singletonpublic class DefaultVisitManager extends AbstractEnvironmentManager implements VisitManager {- private static final int INFO_VERSION = 4;+ private static final int INFO_VERSION = 5;private static final String INFO_DIR = "visit";@@ -40,6 +41,8 @@ public class DefaultVisitManager extends AbstractEnvironmentManager implements Vprivate static final String CODE_COMMENT_STORE = "codeComment";+ private static final String ISSUE_STORE = "issue";+private final StorageManager storageManager;@Inject@@ -47,6 +50,21 @@ public class DefaultVisitManager extends AbstractEnvironmentManager implements Vthis.storageManager = storageManager;}+ @Override+ public void visitIssue(User user, Issue issue) {+ Environment env = getEnv(issue.getProject().getId().toString());+ Store store = getStore(env, ISSUE_STORE);+ env.executeInTransaction(new TransactionalExecutable() {++ @Override+ public void execute(Transaction txn) {+ writeLong(store, txn, new StringPairByteIterable(user.getUUID(), issue.getUUID()),+ System.currentTimeMillis()+1000L);+ }++ });+ }+@Overridepublic void visitPullRequest(User user, PullRequest request) {Environment env = getEnv(request.getTargetProject().getId().toString());@@ -61,7 +79,7 @@ public class DefaultVisitManager extends AbstractEnvironmentManager implements V});}-+@Overridepublic void visitPullRequestCodeComments(User user, PullRequest request) {Environment env = getEnv(request.getTargetProject().getId().toString());@@ -110,6 +128,24 @@ public class DefaultVisitManager extends AbstractEnvironmentManager implements V});}+ @Override+ public Date getIssueVisitDate(User user, Issue issue) {+ Environment env = getEnv(issue.getProject().getId().toString());+ Store store = getStore(env, ISSUE_STORE);+ return env.computeInTransaction(new TransactionalComputable<Date>() {++ @Override+ public Date compute(Transaction txn) {+ long millis = readLong(store, txn, new StringPairByteIterable(user.getUUID(), issue.getUUID()), -1);+ if (millis != -1)+ return new Date(millis);+ else+ return null;+ }++ });+ }+@Overridepublic Date getPullRequestCodeCommentsVisitDate(User user, PullRequest request) {Environment env = getEnv(request.getTargetProject().getId().toString());diff --git a/core/src/main/java/io/onedev/server/model/Issue.java b/core/src/main/java/io/onedev/server/model/Issue.javaindex c07151fcdb..b2d48d597b 100644--- a/core/src/main/java/io/onedev/server/model/Issue.java+++ b/core/src/main/java/io/onedev/server/model/Issue.java@@ -7,6 +7,7 @@ import java.util.HashMap;import java.util.LinkedHashMap;import java.util.List;import java.util.Map;+import java.util.UUID;import javax.annotation.Nullable;import javax.persistence.CascadeType;@@ -26,6 +27,10 @@ import org.hibernate.annotations.Cache;import org.hibernate.annotations.CacheConcurrencyStrategy;import org.hibernate.validator.constraints.NotEmpty;+import io.onedev.server.OneDev;+import io.onedev.server.manager.VisitManager;+import io.onedev.server.model.support.Referenceable;+import io.onedev.server.security.SecurityUtils;import io.onedev.server.util.PromptedField;import io.onedev.server.util.editable.annotation.Editable;import io.onedev.server.util.editable.annotation.Markdown;@@ -41,7 +46,7 @@ import io.onedev.server.util.inputspec.InputSpec;@Index(columnList="votes")})@Cache(usage=CacheConcurrencyStrategy.READ_WRITE)@Editable-public class Issue extends AbstractEntity {+public class Issue extends AbstractEntity implements Referenceable {private static final long serialVersionUID = 1L;@@ -98,6 +103,9 @@ public class Issue extends AbstractEntity {private int votes;+ @Column(nullable=false)+ private String uuid = UUID.randomUUID().toString();+private long number;// used for number search in markdown editor@@ -117,6 +125,9 @@ public class Issue extends AbstractEntity {@OneToMany(mappedBy="other", cascade=CascadeType.REMOVE)private Collection<IssueRelation> relationsByOther = new ArrayList<>();+ @OneToMany(mappedBy="issue", cascade=CascadeType.REMOVE)+ private Collection<IssueComment> comments = new ArrayList<>();+private transient Map<String, PromptedField> promptedFields;public long getVersion() {@@ -160,6 +171,15 @@ public class Issue extends AbstractEntity {this.project = project;}+ public String getUUID() {+ return uuid;+ }++ public void setUUID(String uuid) {+ this.uuid = uuid;+ }++ @Overridepublic long getNumber() {return number;}@@ -190,6 +210,14 @@ public class Issue extends AbstractEntity {this.submitDate = submitDate.getTime();}+ public Collection<IssueComment> getComments() {+ return comments;+ }++ public void setComments(Collection<IssueComment> comments) {+ this.comments = comments;+ }+public int getVotes() {return votes;}@@ -206,6 +234,16 @@ public class Issue extends AbstractEntity {this.fields = fields;}+ public boolean isVisitedAfter(Date date) {+ User user = SecurityUtils.getUser();+ if (user != null) {+ Date visitDate = OneDev.getInstance(VisitManager.class).getIssueVisitDate(user, this);+ return visitDate != null && visitDate.getTime()>date.getTime();+ } else {+ return true;+ }+ }+public Map<String, PromptedField> getPromptedFields() {if (promptedFields == null) {promptedFields = new LinkedHashMap<>();diff --git a/core/src/main/java/io/onedev/server/model/IssueActivity.java b/core/src/main/java/io/onedev/server/model/IssueActivity.javadeleted file mode 100644index 12a5a7eb16..0000000000--- a/core/src/main/java/io/onedev/server/model/IssueActivity.java+++ /dev/null@@ -1,104 +0,0 @@-package io.onedev.server.model;--import java.util.Date;--import javax.persistence.Column;-import javax.persistence.Entity;-import javax.persistence.FetchType;-import javax.persistence.Index;-import javax.persistence.JoinColumn;-import javax.persistence.Lob;-import javax.persistence.ManyToOne;-import javax.persistence.Table;--import io.onedev.server.model.support.issue.ActivityDetail;--@Entity-@Table(indexes={- @Index(columnList="g_issue_id"), @Index(columnList="g_user_id"),- @Index(columnList="comment")})-public class IssueActivity extends AbstractEntity {-- private static final long serialVersionUID = 1L;-- @ManyToOne- @JoinColumn(nullable=false)- private Issue issue;-- @ManyToOne(fetch=FetchType.LAZY)- @JoinColumn- private User user;-- private String userName;-- @Column(nullable=false)- private Date date;-- @Column(nullable=false)- private String summary;-- @Lob- @Column(nullable=false, length=65535)- private String comment;-- @Lob- @Column(nullable=false, length=65535)- private ActivityDetail detail;-- public Issue getIssue() {- return issue;- }-- public void setIssue(Issue issue) {- this.issue = issue;- }-- public User getUser() {- return user;- }-- public void setUser(User user) {- this.user = user;- }-- public String getUserName() {- return userName;- }-- public void setUserName(String userName) {- this.userName = userName;- }-- public Date getDate() {- return date;- }-- public void setDate(Date date) {- this.date = date;- }-- public String getSummary() {- return summary;- }-- public void setSummary(String summary) {- this.summary = summary;- }-- public String getComment() {- return comment;- }-- public void setComment(String comment) {- this.comment = comment;- }-- public ActivityDetail getDetail() {- return detail;- }-- public void setDetail(ActivityDetail detail) {- this.detail = detail;- }--}diff --git a/core/src/main/java/io/onedev/server/model/IssueComment.java b/core/src/main/java/io/onedev/server/model/IssueComment.javaindex e40089b355..5e1b3af8fb 100644--- a/core/src/main/java/io/onedev/server/model/IssueComment.java+++ b/core/src/main/java/io/onedev/server/model/IssueComment.java@@ -3,12 +3,18 @@ package io.onedev.server.model;import java.util.Date;import javax.persistence.Column;+import javax.persistence.Entity;import javax.persistence.FetchType;+import javax.persistence.Index;import javax.persistence.JoinColumn;import javax.persistence.Lob;import javax.persistence.ManyToOne;+import javax.persistence.Table;import javax.persistence.Version;+@Entity+@Table(indexes={+ @Index(columnList="g_issue_id"), @Index(columnList="g_user_id")})public class IssueComment extends AbstractEntity {private static final long serialVersionUID = 1L;@@ -16,9 +22,9 @@ public class IssueComment extends AbstractEntity {@Versionprivate long version;- @ManyToOne(fetch=FetchType.LAZY)+ @ManyToOne@JoinColumn(nullable=false)- private Project project;+ private Issue issue;@ManyToOne(fetch=FetchType.LAZY)@JoinColumn@@ -26,23 +32,27 @@ public class IssueComment extends AbstractEntity {private String userName;+ @Column(nullable=false)+ private Date date;+@Lob@Column(nullable=false, length=65535)private String content;-- @Column(nullable=false)- private Date date = new Date();public long getVersion() {return version;}- public Project getProject() {- return project;+ public void setVersion(long version) {+ this.version = version;}- public void setProject(Project project) {- this.project = project;+ public Issue getIssue() {+ return issue;+ }++ public void setIssue(Issue issue) {+ this.issue = issue;}public User getUser() {@@ -61,6 +71,14 @@ public class IssueComment extends AbstractEntity {this.userName = userName;}+ public Date getDate() {+ return date;+ }++ public void setDate(Date date) {+ this.date = date;+ }+public String getContent() {return content;}@@ -69,12 +87,8 @@ public class IssueComment extends AbstractEntity {this.content = content;}- public Date getDate() {- return date;+ public String getAnchor() {+ return getClass().getSimpleName() + "-" + getId();}- public void setDate(Date date) {- this.date = date;- }-}diff --git a/core/src/main/java/io/onedev/server/model/PullRequest.java b/core/src/main/java/io/onedev/server/model/PullRequest.javaindex 46f2d29c90..fcd60d11be 100644--- a/core/src/main/java/io/onedev/server/model/PullRequest.java+++ b/core/src/main/java/io/onedev/server/model/PullRequest.java@@ -52,6 +52,7 @@ import io.onedev.server.model.support.LastEvent;import io.onedev.server.model.support.MergePreview;import io.onedev.server.model.support.MergeStrategy;import io.onedev.server.model.support.ProjectAndBranch;+import io.onedev.server.model.support.Referenceable;import io.onedev.server.security.SecurityUtils;import io.onedev.server.util.QualityCheckStatus;import io.onedev.server.util.diff.WhitespaceOption;@@ -75,7 +76,7 @@ import io.onedev.server.util.jackson.RestView;@Index(columnList="closeDate"), @Index(columnList="closeStatus"),@Index(columnList="g_closedBy_id"), @Index(columnList="closedByName")},uniqueConstraints={@UniqueConstraint(columnNames={"g_targetProject_id", "number"})})-public class PullRequest extends AbstractEntity {+public class PullRequest extends AbstractEntity implements Referenceable {private static final long serialVersionUID = 1L;@@ -651,7 +652,8 @@ public class PullRequest extends AbstractEntity {public void setUUID(String uuid) {this.uuid = uuid;}-++ @Overridepublic long getNumber() {return number;}diff --git a/core/src/main/java/io/onedev/server/model/support/Referenceable.java b/core/src/main/java/io/onedev/server/model/support/Referenceable.javanew file mode 100644index 0000000000..597cfcacb6--- /dev/null+++ b/core/src/main/java/io/onedev/server/model/support/Referenceable.java@@ -0,0 +1,5 @@+package io.onedev.server.model.support;++public interface Referenceable {+ long getNumber();+}diff --git a/core/src/main/java/io/onedev/server/model/support/issue/ActivityDetail.java b/core/src/main/java/io/onedev/server/model/support/issue/ActivityDetail.javadeleted file mode 100644index 5410d7c836..0000000000--- a/core/src/main/java/io/onedev/server/model/support/issue/ActivityDetail.java+++ /dev/null@@ -1,13 +0,0 @@-package io.onedev.server.model.support.issue;--import java.io.Serializable;--import org.apache.wicket.Component;--import io.onedev.server.model.IssueActivity;--public interface ActivityDetail extends Serializable {-- Component render(String componentId, IssueActivity activity);--}diff --git a/core/src/main/java/io/onedev/server/security/SecurityUtils.java b/core/src/main/java/io/onedev/server/security/SecurityUtils.javaindex 22692e3e01..5017a14f78 100644--- a/core/src/main/java/io/onedev/server/security/SecurityUtils.java+++ b/core/src/main/java/io/onedev/server/security/SecurityUtils.java@@ -15,6 +15,7 @@ import io.onedev.server.manager.UserManager;import io.onedev.server.model.CodeComment;import io.onedev.server.model.CodeCommentReply;import io.onedev.server.model.Issue;+import io.onedev.server.model.IssueComment;import io.onedev.server.model.Project;import io.onedev.server.model.PullRequest;import io.onedev.server.model.PullRequestComment;@@ -127,7 +128,16 @@ public class SecurityUtils extends org.apache.shiro.SecurityUtils {if (currentUser == null) {return false;} else {- return currentUser.equals(comment.getUser()) || canModify(comment.getRequest());+ return currentUser.equals(comment.getUser()) || canManage(comment.getRequest().getTargetProject());+ }+ }++ public static boolean canModify(IssueComment comment) {+ User currentUser = getUser();+ if (currentUser == null) {+ return false;+ } else {+ return currentUser.equals(comment.getUser()) || canManage(comment.getIssue().getProject());}}diff --git a/core/src/main/java/io/onedev/server/util/markdown/IssueParser.java b/core/src/main/java/io/onedev/server/util/markdown/IssueParser.javaindex 14cd5e9f1f..57259f0e7b 100644--- a/core/src/main/java/io/onedev/server/util/markdown/IssueParser.java+++ b/core/src/main/java/io/onedev/server/util/markdown/IssueParser.java@@ -1,74 +1,15 @@package io.onedev.server.util.markdown;-import java.util.Collection;-import java.util.HashSet;-import java.util.regex.Matcher;-import java.util.regex.Pattern;--import org.jsoup.Jsoup;-import org.jsoup.nodes.Document;-import org.jsoup.nodes.TextNode;-import org.jsoup.select.NodeTraversor;--import com.google.common.collect.ImmutableSet;-import io.onedev.server.OneDev;import io.onedev.server.manager.IssueManager;import io.onedev.server.model.Issue;import io.onedev.server.model.Project;-import io.onedev.server.util.JsoupUtils;-import io.onedev.server.util.TextNodeVisitor;-import io.onedev.utils.StringUtils;--public class IssueParser {-- private static final Collection<String> IGNORED_TAGS = ImmutableSet.of("pre", "code", "a");-- private static final Pattern PATTERN = Pattern.compile("(^|\\s+)(issue\\s+)#(\\d+)(?=($|\\s+))", Pattern.CASE_INSENSITIVE);- public Collection<Issue> parseIssues(Project project, String rendered) {- return parseIssues(project, Jsoup.parseBodyFragment(rendered));- }-- public Collection<Issue> parseIssues(Project project, Document document) {- Collection<Issue> references = new HashSet<>();-- TextNodeVisitor visitor = new TextNodeVisitor() {-- @Override- protected boolean isApplicable(TextNode node) {- if (JsoupUtils.hasAncestor(node, IGNORED_TAGS))- return false;-- return StringUtils.deleteWhitespace(node.getWholeText()).trim().contains("issue#"); // fast scan here, do pattern match later- }- };-- NodeTraversor tranversor = new NodeTraversor(visitor);- tranversor.traverse(document);-- for (TextNode node : visitor.getMatchedNodes()) {- Matcher matcher = PATTERN.matcher(node.getWholeText());- while (matcher.find()) {- Long issueNumber = Long.valueOf(matcher.group(3));- String issueTag;- Issue issue = OneDev.getInstance(IssueManager.class).find(project, issueNumber);- if (issue != null) {- references.add(issue);- issueTag = toHtml(issue);- } else {- issueTag = "#" + issueNumber;- }- JsoupUtils.appendReplacement(matcher, node, matcher.group(1) + matcher.group(2) + issueTag + matcher.group(4));- }- JsoupUtils.appendTail(matcher, node);- }-- return references;- }+public class IssueParser extends ReferenceParser<Issue> {- protected String toHtml(Issue issue) {- return "#" + issue.getNumber();+ @Override+ protected Issue findReferenceable(Project project, long number) {+ return OneDev.getInstance(IssueManager.class).find(project, number);}}diff --git a/core/src/main/java/io/onedev/server/util/markdown/PullRequestParser.java b/core/src/main/java/io/onedev/server/util/markdown/PullRequestParser.javaindex 9b2e5ddd3d..b775b9e312 100644--- a/core/src/main/java/io/onedev/server/util/markdown/PullRequestParser.java+++ b/core/src/main/java/io/onedev/server/util/markdown/PullRequestParser.java@@ -1,74 +1,15 @@package io.onedev.server.util.markdown;-import java.util.Collection;-import java.util.HashSet;-import java.util.regex.Matcher;-import java.util.regex.Pattern;--import org.jsoup.Jsoup;-import org.jsoup.nodes.Document;-import org.jsoup.nodes.TextNode;-import org.jsoup.select.NodeTraversor;--import com.google.common.collect.ImmutableSet;-import io.onedev.server.OneDev;import io.onedev.server.manager.PullRequestManager;import io.onedev.server.model.Project;import io.onedev.server.model.PullRequest;-import io.onedev.server.util.JsoupUtils;-import io.onedev.server.util.TextNodeVisitor;-import io.onedev.utils.StringUtils;--public class PullRequestParser {-- private static final Collection<String> IGNORED_TAGS = ImmutableSet.of("pre", "code", "a");-- private static final Pattern PATTERN = Pattern.compile("(^|\\s+)(pull\\s*request\\s+)#(\\d+)(?=($|\\s+))", Pattern.CASE_INSENSITIVE);- public Collection<PullRequest> parseRequests(Project project, String rendered) {- return parseRequests(project, Jsoup.parseBodyFragment(rendered));- }-- public Collection<PullRequest> parseRequests(Project project, Document document) {- Collection<PullRequest> references = new HashSet<>();-- TextNodeVisitor visitor = new TextNodeVisitor() {-- @Override- protected boolean isApplicable(TextNode node) {- if (JsoupUtils.hasAncestor(node, IGNORED_TAGS))- return false;-- return StringUtils.deleteWhitespace(node.getWholeText()).trim().contains("pullrequest#"); // fast scan here, do pattern match later- }- };-- NodeTraversor tranversor = new NodeTraversor(visitor);- tranversor.traverse(document);-- for (TextNode node : visitor.getMatchedNodes()) {- Matcher matcher = PATTERN.matcher(node.getWholeText());- while (matcher.find()) {- Long requestNumber = Long.valueOf(matcher.group(3));- String requestTag;- PullRequest request = OneDev.getInstance(PullRequestManager.class).find(project, requestNumber);- if (request != null) {- references.add(request);- requestTag = toHtml(request);- } else {- requestTag = "#" + requestNumber;- }- JsoupUtils.appendReplacement(matcher, node, matcher.group(1) + matcher.group(2) + requestTag + matcher.group(4));- }- JsoupUtils.appendTail(matcher, node);- }-- return references;- }+public class PullRequestParser extends ReferenceParser<PullRequest> {- protected String toHtml(PullRequest request) {- return "#" + request.getNumber();+ @Override+ protected PullRequest findReferenceable(Project project, long number) {+ return OneDev.getInstance(PullRequestManager.class).find(project, number);}}diff --git a/core/src/main/java/io/onedev/server/util/markdown/ReferenceParser.java b/core/src/main/java/io/onedev/server/util/markdown/ReferenceParser.javanew file mode 100644index 0000000000..2ed6bfb290--- /dev/null+++ b/core/src/main/java/io/onedev/server/util/markdown/ReferenceParser.java@@ -0,0 +1,96 @@+package io.onedev.server.util.markdown;++import java.util.Collection;+import java.util.HashSet;+import java.util.List;+import java.util.regex.Matcher;+import java.util.regex.Pattern;++import org.jsoup.Jsoup;+import org.jsoup.nodes.Document;+import org.jsoup.nodes.TextNode;+import org.jsoup.select.NodeTraversor;++import com.google.common.collect.ImmutableSet;++import io.onedev.server.model.AbstractEntity;+import io.onedev.server.model.Project;+import io.onedev.server.model.support.Referenceable;+import io.onedev.server.util.JsoupUtils;+import io.onedev.server.util.TextNodeVisitor;+import io.onedev.utils.ReflectionUtils;+import io.onedev.utils.StringUtils;+import io.onedev.utils.WordUtils;++public abstract class ReferenceParser<T extends Referenceable> {++ private static final Collection<String> IGNORED_TAGS = ImmutableSet.of("pre", "code", "a");++ private final Pattern pattern;++ private final String fastScan;++ public ReferenceParser() {+ List<Class<?>> typeArguments = ReflectionUtils.getTypeArguments(ReferenceParser.class, getClass());+ if (typeArguments.size() == 1 && AbstractEntity.class.isAssignableFrom(typeArguments.get(0))) {+ Class<?> referenceClass = typeArguments.get(0);+ fastScan = referenceClass.getSimpleName().toLowerCase().toLowerCase()+"#";+ String[] words = StringUtils.split(WordUtils.uncamel(referenceClass.getSimpleName()).toLowerCase(), " ");+ StringBuilder builder = new StringBuilder("(^|\\s+)(");+ for (int i=0; i<words.length-1; i++)+ builder.append(words[i]).append("\\s*");+ builder.append(words[words.length-1]).append("\\s+)#(\\d+)(?=($|\\s+))");+ pattern = Pattern.compile(builder.toString(), Pattern.CASE_INSENSITIVE);+ } else {+ throw new RuntimeException("Sub class of ReferenceParser must realize the type argument <T>");+ }+ }++ public Collection<T> parseReferences(Project project, String rendered) {+ return parseReferences(project, Jsoup.parseBodyFragment(rendered));+ }++ protected abstract T findReferenceable(Project project, long number);++ public Collection<T> parseReferences(Project project, Document document) {+ Collection<T> references = new HashSet<>();++ TextNodeVisitor visitor = new TextNodeVisitor() {++ @Override+ protected boolean isApplicable(TextNode node) {+ if (JsoupUtils.hasAncestor(node, IGNORED_TAGS))+ return false;++ return StringUtils.deleteWhitespace(node.getWholeText()).trim().contains(fastScan); // fast scan here, do pattern match later+ }+ };++ NodeTraversor tranversor = new NodeTraversor(visitor);+ tranversor.traverse(document);++ for (TextNode node : visitor.getMatchedNodes()) {+ Matcher matcher = pattern.matcher(node.getWholeText());+ while (matcher.find()) {+ Long referenceNumber = Long.valueOf(matcher.group(3));+ String referenceTag;+ T referenceable = findReferenceable(project, referenceNumber);+ if (referenceable != null) {+ references.add(referenceable);+ referenceTag = toHtml(referenceable);+ } else {+ referenceTag = "#" + referenceNumber;+ }+ JsoupUtils.appendReplacement(matcher, node, matcher.group(1) + matcher.group(2) + referenceTag + matcher.group(4));+ }+ JsoupUtils.appendTail(matcher, node);+ }++ return references;+ }++ protected String toHtml(T referenceable) {+ return "#" + referenceable.getNumber();+ }++}diff --git a/core/src/main/java/io/onedev/server/web/OneUrlMapper.java b/core/src/main/java/io/onedev/server/web/OneUrlMapper.javaindex 0d3565af68..76328f8d55 100644--- a/core/src/main/java/io/onedev/server/web/OneUrlMapper.java+++ b/core/src/main/java/io/onedev/server/web/OneUrlMapper.java@@ -33,7 +33,6 @@ import io.onedev.server.web.page.project.commits.CommitDetailPage;import io.onedev.server.web.page.project.commits.ProjectCommitsPage;import io.onedev.server.web.page.project.compare.RevisionComparePage;import io.onedev.server.web.page.project.issues.issuedetail.IssueDetailPage;-import io.onedev.server.web.page.project.issues.issueedit.IssueEditPage;import io.onedev.server.web.page.project.issues.issuelist.IssueListPage;import io.onedev.server.web.page.project.issues.newissue.NewIssuePage;import io.onedev.server.web.page.project.pullrequests.InvalidRequestPage;@@ -199,7 +198,6 @@ public class OneUrlMapper extends CompoundRequestMapper {add(new OnePageMapper("projects/${project}/issues", IssueListPage.class));add(new OnePageMapper("projects/${project}/issues/${issue}", IssueDetailPage.class));- add(new OnePageMapper("projects/${project}/issues/${issue}/edit", IssueEditPage.class));add(new OnePageMapper("projects/${project}/issues/new", NewIssuePage.class));add(new OnePageMapper("projects/${project}/settings/general", GeneralSettingPage.class));diff --git a/core/src/main/java/io/onedev/server/web/component/comment/code-comment.css b/core/src/main/java/io/onedev/server/web/component/comment/code-comment.cssindex fd8c1d0006..0d7a0606d3 100644--- a/core/src/main/java/io/onedev/server/web/component/comment/code-comment.css+++ b/core/src/main/java/io/onedev/server/web/component/comment/code-comment.css@@ -11,7 +11,6 @@}.code-comments td.result {border: 2px solid #E0E0E0;- vertical-align: top;text-align: left;}.code-comments td.comment {diff --git a/core/src/main/java/io/onedev/server/web/component/diff/blob/text/TextDiffPanel.html b/core/src/main/java/io/onedev/server/web/component/diff/blob/text/TextDiffPanel.htmlindex f528a87417..3e54a67fe7 100644--- a/core/src/main/java/io/onedev/server/web/component/diff/blob/text/TextDiffPanel.html+++ b/core/src/main/java/io/onedev/server/web/component/diff/blob/text/TextDiffPanel.html@@ -9,7 +9,7 @@<a wicket:id="editFile" class="btn btn-xs btn-default">Edit</a></div></div>- <table class="body"><wicket:container wicket:id="diffLines"></wicket:container></table>+ <table class="body diff"><wicket:container wicket:id="diffLines"></wicket:container></table></div><div wicket:id="symbolTooltip"></div></wicket:panel>\ No newline at end of filediff --git a/core/src/main/java/io/onedev/server/web/component/diff/blob/text/TextDiffResourceReference.java b/core/src/main/java/io/onedev/server/web/component/diff/blob/text/TextDiffResourceReference.javaindex b84f674fde..a4984770b7 100644--- a/core/src/main/java/io/onedev/server/web/component/diff/blob/text/TextDiffResourceReference.java+++ b/core/src/main/java/io/onedev/server/web/component/diff/blob/text/TextDiffResourceReference.java@@ -11,6 +11,7 @@ import de.agilecoders.wicket.webjars.request.resource.WebjarsCssResourceReferencimport io.onedev.server.web.asset.clipboard.ClipboardResourceReference;import io.onedev.server.web.asset.hover.HoverResourceReference;import io.onedev.server.web.asset.selectionpopover.SelectionPopoverResourceReference;+import io.onedev.server.web.component.diff.table.DiffTableResourceReference;import io.onedev.server.web.page.base.BaseDependentResourceReference;public class TextDiffResourceReference extends BaseDependentResourceReference {@@ -28,6 +29,7 @@ public class TextDiffResourceReference extends BaseDependentResourceReference {dependencies.add(JavaScriptHeaderItem.forReference(new SelectionPopoverResourceReference()));dependencies.add(JavaScriptHeaderItem.forReference(new ClipboardResourceReference()));dependencies.add(CssHeaderItem.forReference(new WebjarsCssResourceReference("codemirror/current/theme/eclipse.css")));+ dependencies.add(CssHeaderItem.forReference(new DiffTableResourceReference()));dependencies.add(CssHeaderItem.forReference(new CssResourceReference(TextDiffPanel.class, "text-diff.css")));return dependencies;}diff --git a/core/src/main/java/io/onedev/server/web/component/diff/blob/text/text-diff.css b/core/src/main/java/io/onedev/server/web/component/diff/blob/text/text-diff.cssindex 4718159256..78294c80e5 100644--- a/core/src/main/java/io/onedev/server/web/component/diff/blob/text/text-diff.css+++ b/core/src/main/java/io/onedev/server/web/component/diff/blob/text/text-diff.css@@ -2,6 +2,10 @@border: 1px solid #E0E0E0;position: relative;}+.text-diff table.diff {+ border: none;+ position: inherit;+}.text-diff>.head {padding: 8px;border-bottom: 1px solid #E0E0E0;@@ -18,117 +22,6 @@.text-diff>.head>div:last-child {margin-right: 0;}-.text-diff>.body {- font-family: Consolas, "Liberation Mono", Menlo, Courier, monospace;- font-size: 12px;- table-layout: fixed;- border-collapse: separate;-}--/*- * have to use relative here as otherwise the last table row will have problem- * focusing on expander link. This relates to negative margin top- * specified for change class in revision diff panel- */-.text-diff>.body>tbody>tr>td {- position: relative;-}-.text-diff>.body>tbody>tr>td.number {- padding: 0 4px;- border-left: 1px solid #E0E0E0;- text-align: right;- font-size: 12px;- color: #9E9E9E;-}-.text-diff>.body>tbody>tr>td.operation {- border-left: 1px solid #E0E0E0;-}-.text-diff>.body>tbody>tr>td:FIRST-CHILD {- border-left: none !important;-}-.text-diff>.body>tbody>tr:FIRST-CHILD>td {- border-top: none !important;-}-.text-diff>.body>tbody>tr:LAST-CHILD>td {- border-bottom: none !important;-}-.text-diff>.body>tbody>tr.expander>td.skipped {- padding: 6px 16px;- border-left: 1px solid #D8E2F2;- background: #f4f7fb;- color: #999;-}-.text-diff>.body>tbody>tr.expander>td.expander {- border-left: 1px solid #D8E2F2;- text-align: center;-}-.text-diff>.body>tbody>tr.expander>td.expander a {- display: block;- background: #edf2f9;- padding: 6px 0;- color: #888;-}-.text-diff>.body>tbody>tr.expander>td.expander>a:hover {- background: #4078c0;- color: white;-}-.text-diff>.body>tbody>tr>td.old.number {- background: #ffdddd;- border-left: 1px solid #f1c0c0;-}-.text-diff>.body>tbody>tr>td.old.content {- background: #ffecec;-}-.text-diff>.body>tbody>tr>td.old.operation {- border-left: 1px solid #f1c0c0;- background: #ffecec;-}-.text-diff>.body>tbody>tr>td.old .delete {- background-color: #F8B8B8;- text-decoration: line-through;-}-.text-diff>.body>tbody>tr>td.new.number {- background: #dbffdb;- border-left: 1px solid #c1e9c1;-}-.text-diff>.body>tbody>tr>td.new.content {- background: #eaffea;-}-.text-diff>.body>tbody>tr>td.new.operation {- border-left: 1px solid #c1e9c1;- background: #eaffea;-}-.text-diff>.body>tbody>tr>td.new .insert {- background-color: #94F094;-}-.text-diff>.body>tbody>tr>td.old.new.number {- background: #FAF3D0;- border-left: 1px solid #EBD049;-}-.text-diff>.body>tbody>tr>td.old.new.content {- background: #FCF8E4;-}-.text-diff>.body>tbody>tr>td.old.new.operation {- border-left: 1px solid #EBD049;- background: #FCF8E4;-}-.text-diff>.body>tbody>tr>td.content {- white-space: pre-wrap;- word-wrap: break-word;-}-.text-diff>.body>tbody>tr>td.operation {- font-weight: bold;- padding: 0 4px 0 4px;-}-.text-diff>.body>tbody>tr.original+.expanded>td {- border-top: 1px solid #E8E8E8;-}-.text-diff>.body>tbody>tr.expanded+.original>td {- border-top: 1px solid #E8E8E8;-}-.text-diff>.body>tbody>tr.expanded>td {- background: #F9F9F9;-}.text-diff>.body>tbody>tr>td.content>span.content-mark {background: #CCCCFF;}@@ -189,9 +82,6 @@.text-diff>.body>tbody>tr>td.blame.abbr .same-as-above {margin-left: 14px;}-.text-diff>.body>tbody>tr:hover>td {- background: #E8F2FE !important;-}.diff-tokentooltip {background-color: #FBFCC5;border: 1px solid black;diff --git a/core/src/main/java/io/onedev/server/web/component/diff/plain/PlainDiffPanel.html b/core/src/main/java/io/onedev/server/web/component/diff/plain/PlainDiffPanel.htmlnew file mode 100644index 0000000000..7aaa3c343e--- /dev/null+++ b/core/src/main/java/io/onedev/server/web/component/diff/plain/PlainDiffPanel.html@@ -0,0 +1,3 @@+<wicket:panel>+ <table class="plain diff"><wicket:container wicket:id="diffLines"></wicket:container></table>+</wicket:panel>\ No newline at end of filediff --git a/core/src/main/java/io/onedev/server/web/component/diff/plain/PlainDiffPanel.java b/core/src/main/java/io/onedev/server/web/component/diff/plain/PlainDiffPanel.javanew file mode 100644index 0000000000..f0d448f56f--- /dev/null+++ b/core/src/main/java/io/onedev/server/web/component/diff/plain/PlainDiffPanel.java@@ -0,0 +1,322 @@+package io.onedev.server.web.component.diff.plain;++import static org.apache.wicket.ajax.attributes.CallbackParameter.explicit;++import java.util.HashMap;+import java.util.LinkedHashMap;+import java.util.List;+import java.util.Map;++import javax.annotation.Nullable;++import org.apache.wicket.ajax.AjaxRequestTarget;+import org.apache.wicket.markup.head.IHeaderResponse;+import org.apache.wicket.markup.head.JavaScriptHeaderItem;+import org.apache.wicket.markup.head.OnDomReadyHeaderItem;+import org.apache.wicket.markup.html.basic.Label;+import org.apache.wicket.markup.html.panel.Panel;+import org.apache.wicket.model.LoadableDetachableModel;+import org.apache.wicket.request.IRequestParameters;+import org.apache.wicket.request.cycle.RequestCycle;++import io.onedev.jsyntax.TextToken;+import io.onedev.jsyntax.TokenUtils;+import io.onedev.jsyntax.Tokenized;+import io.onedev.server.util.diff.DiffBlock;+import io.onedev.server.util.diff.DiffMatchPatch.Operation;+import io.onedev.server.util.diff.DiffUtils;+import io.onedev.server.util.diff.LineDiff;+import io.onedev.server.util.diff.WhitespaceOption;+import io.onedev.server.web.WebConstants;+import io.onedev.server.web.behavior.AbstractPostAjaxBehavior;+import io.onedev.utils.StringUtils;++@SuppressWarnings("serial")+public class PlainDiffPanel extends Panel {++ private final Map<Integer, Integer> contextSizes = new HashMap<>();++ private AbstractPostAjaxBehavior callbackBehavior;++ private List<DiffBlock<Tokenized>> diffBlocks;++ public PlainDiffPanel(String id, List<String> oldLines, List<String> newLines) {+ super(id);+ diffBlocks = DiffUtils.diff(oldLines, null, newLines, null, WhitespaceOption.IGNORE_CHANGE);+ }++ @Override+ protected void onInitialize() {+ super.onInitialize();++ add(new Label("diffLines", new LoadableDetachableModel<String>() {++ @Override+ protected String load() {+ return renderDiffs();+ }++ }).setEscapeModelStrings(false));++ add(callbackBehavior = new AbstractPostAjaxBehavior() {++ @Override+ protected void respond(AjaxRequestTarget target) {+ IRequestParameters params = RequestCycle.get().getRequest().getPostParameters();+ int index = params.getParameterValue("index").toInt();+ Integer lastContextSize = contextSizes.get(index);+ if (lastContextSize == null)+ lastContextSize = WebConstants.DIFF_CONTEXT_SIZE;+ int contextSize = lastContextSize + WebConstants.DIFF_EXPAND_SIZE;+ contextSizes.put(index, contextSize);++ StringBuilder builder = new StringBuilder();+ appendEquals(builder, index, lastContextSize, contextSize);++ String expanded = StringUtils.replace(builder.toString(), "\"", "\\\"");+ expanded = StringUtils.replace(expanded, "\n", "");+ String script = String.format("onedev.server.plainDiff.expand('%s', %d, \"%s\");",+ getMarkupId(), index, expanded);+ target.appendJavaScript(script);+ }++ });+ }++ private void appendEquals(StringBuilder builder, int index, int lastContextSize, int contextSize) {+ DiffBlock<Tokenized> block = diffBlocks.get(index);+ if (index == 0) {+ int start = block.getUnits().size()-contextSize;+ if (start < 0)+ start=0;+ else if (start > 0)+ appendExpander(builder, index, start);+ for (int j=start; j<block.getUnits().size()-lastContextSize; j++)+ appendEqual(builder, block, j, lastContextSize);+ } else if (index == diffBlocks.size()-1) {+ int end = block.getUnits().size();+ int skipped = 0;+ if (end > contextSize) {+ skipped = end-contextSize;+ end = contextSize;+ }+ for (int j=lastContextSize; j<end; j++)+ appendEqual(builder, block, j, lastContextSize);+ if (skipped != 0)+ appendExpander(builder, index, skipped);+ } else if (2*contextSize < block.getUnits().size()) {+ for (int j=lastContextSize; j<contextSize; j++)+ appendEqual(builder, block, j, lastContextSize);+ appendExpander(builder, index, block.getUnits().size() - 2*contextSize);+ for (int j=block.getUnits().size()-contextSize; j<block.getUnits().size()-lastContextSize; j++)+ appendEqual(builder, block, j, lastContextSize);+ } else {+ for (int j=lastContextSize; j<block.getUnits().size()-lastContextSize; j++)+ appendEqual(builder, block, j, lastContextSize);+ }+ }++ @Override+ public void renderHead(IHeaderResponse response) {+ super.renderHead(response);++ response.render(JavaScriptHeaderItem.forReference(new PlainDiffResourceReference()));++ CharSequence callback = callbackBehavior.getCallbackFunction(explicit("index"));+ String script = String.format("onedev.server.plainDiff.onDomReady('%s', %s);", getMarkupId(), callback);+ response.render(OnDomReadyHeaderItem.forScript(script));+ }++ private String renderDiffs() {+ StringBuilder builder = new StringBuilder();+ builder.append(""+ + "<colgroup>"+ + "<col width='40'></col>"+ + "<col width='40'></col>"+ + "<col width='15'></col>"+ + "<col></col>"+ + "</colgroup>");+ for (int i=0; i<diffBlocks.size(); i++) {+ DiffBlock<Tokenized> block = diffBlocks.get(i);+ if (block.getOperation() == Operation.EQUAL) {+ Integer lastContextSize = contextSizes.get(i);+ if (lastContextSize == null)+ lastContextSize = WebConstants.DIFF_CONTEXT_SIZE;+ appendEquals(builder, i, 0, lastContextSize);+ } else if (block.getOperation() == Operation.DELETE) {+ if (i+1<diffBlocks.size()) {+ DiffBlock<Tokenized> nextBlock = diffBlocks.get(i+1);+ if (nextBlock.getOperation() == Operation.INSERT) {+ LinkedHashMap<Integer, LineDiff> lineChanges =+ DiffUtils.align(block.getUnits(), nextBlock.getUnits());+ int prevDeleteLineIndex = 0;+ int prevInsertLineIndex = 0;+ for (Map.Entry<Integer, LineDiff> entry: lineChanges.entrySet()) {+ int deleteLineIndex = entry.getKey();+ LineDiff lineChange = entry.getValue();+ int insertLineIndex = lineChange.getCompareLine();++ appendDeletesAndInserts(builder, block, nextBlock, prevDeleteLineIndex, deleteLineIndex,+ prevInsertLineIndex, insertLineIndex);++ appendModification(builder, block, nextBlock, deleteLineIndex, insertLineIndex,+ lineChange.getTokenDiffs());++ prevDeleteLineIndex = deleteLineIndex+1;+ prevInsertLineIndex = insertLineIndex+1;+ }+ appendDeletesAndInserts(builder, block, nextBlock,+ prevDeleteLineIndex, block.getUnits().size(),+ prevInsertLineIndex, nextBlock.getUnits().size());+ i++;+ } else {+ for (int j=0; j<block.getUnits().size(); j++)+ appendDelete(builder, block, j, null);+ }+ } else {+ for (int j=0; j<block.getUnits().size(); j++)+ appendDelete(builder, block, j, null);+ }+ } else {+ for (int j=0; j<block.getUnits().size(); j++)+ appendInsert(builder, block, j, null);+ }+ }+ return builder.toString();+ }++ private void appendDeletesAndInserts(StringBuilder builder, DiffBlock<Tokenized> deleteBlock,+ DiffBlock<Tokenized> insertBlock, int fromDeleteLineIndex, int toDeleteLineIndex,+ int fromInsertLineIndex, int toInsertLineIndex) {+ for (int i=fromDeleteLineIndex; i<toDeleteLineIndex; i++)+ appendDelete(builder, deleteBlock, i, null);+ for (int i=fromInsertLineIndex; i<toInsertLineIndex; i++)+ appendInsert(builder, insertBlock, i, null);+ }++ private String getOperationClass(Operation operation) {+ if (operation == Operation.INSERT)+ return "insert";+ else if (operation == Operation.DELETE)+ return "delete";+ else+ return null;+ }++ private void appendTokenized(StringBuilder builder, Tokenized tokenized) {+ if (tokenized.getTokens().length == 0) {+ builder.append(" ");+ } else {+ for (long token: tokenized.getTokens()) {+ builder.append(TokenUtils.toHtml(tokenized.getText(), token, null));+ }+ }+ }++ private void appendEqual(StringBuilder builder, DiffBlock<Tokenized> block, int lineIndex, int lastContextSize) {+ if (lastContextSize != 0)+ builder.append("<tr class='code expanded'>");+ else+ builder.append("<tr class='code original'>");++ int oldLineNo = block.getOldStart() + lineIndex;+ int newLineNo = block.getNewStart() + lineIndex;++ builder.append("<td class='number noselect'>").append(oldLineNo+1).append("</td>");+ builder.append("<td class='number noselect'>").append(newLineNo+1).append("</td>");+ builder.append("<td class='operation noselect'> </td>");+ builder.append("<td class='content' data-old='").append(oldLineNo).append("' data-new='").append(newLineNo).append("'>");+ appendTokenized(builder, block.getUnits().get(lineIndex));+ builder.append("</td>");+ builder.append("</tr>");+ }++ private void appendInsert(StringBuilder builder, DiffBlock<Tokenized> block, int lineIndex,+ @Nullable List<DiffBlock<TextToken>> tokenDiffs) {+ builder.append("<tr class='code original'>");++ int newLineNo = block.getNewStart() + lineIndex;+ builder.append("<td class='number noselect new'> </td>");+ builder.append("<td class='number noselect new'>").append(newLineNo+1).append("</td>");+ builder.append("<td class='operation noselect new'>+</td>");+ builder.append("<td class='content new' data-new='").append(newLineNo).append("'>");+ if (tokenDiffs != null) {+ if (tokenDiffs.isEmpty()) {+ builder.append(" ");+ } else {+ for (DiffBlock<TextToken> tokenBlock: tokenDiffs) {+ for (TextToken token: tokenBlock.getUnits()) {+ if (tokenBlock.getOperation() != Operation.DELETE)+ builder.append(TokenUtils.toHtml(token, getOperationClass(tokenBlock.getOperation())));+ }+ }+ }+ } else {+ appendTokenized(builder, block.getUnits().get(lineIndex));+ }+ builder.append("</td>");+ builder.append("</tr>");+ }++ private void appendDelete(StringBuilder builder, DiffBlock<Tokenized> block, int lineIndex,+ @Nullable List<DiffBlock<TextToken>> tokenDiffs) {+ builder.append("<tr class='code original'>");++ int oldLineNo = block.getOldStart() + lineIndex;+ builder.append("<td class='number noselect old'>").append(oldLineNo+1).append("</td>");+ builder.append("<td class='number noselect old'> </td>");+ builder.append("<td class='operation noselect old'>-</td>");+ builder.append("<td class='content old' data-old='").append(oldLineNo).append("'>");+ if (tokenDiffs != null) {+ if (tokenDiffs.isEmpty()) {+ builder.append(" ");+ } else {+ for (DiffBlock<TextToken> tokenBlock: tokenDiffs) {+ for (TextToken token: tokenBlock.getUnits()) {+ if (tokenBlock.getOperation() != Operation.INSERT)+ builder.append(TokenUtils.toHtml(token, getOperationClass(tokenBlock.getOperation())));+ }+ }+ }+ } else {+ appendTokenized(builder, block.getUnits().get(lineIndex));+ }+ builder.append("</td>");+ builder.append("</tr>");+ }++ private void appendModification(StringBuilder builder, DiffBlock<Tokenized> deleteBlock,+ DiffBlock<Tokenized> insertBlock, int deleteLineIndex, int insertLineIndex,+ List<DiffBlock<TextToken>> tokenDiffs) {+ builder.append("<tr class='code original'>");++ int oldLineNo = deleteBlock.getOldStart() + deleteLineIndex;+ int newLineNo = insertBlock.getNewStart() + insertLineIndex;+ builder.append("<td class='number noselect old new'>").append(oldLineNo+1).append("</td>");+ builder.append("<td class='number noselect old new'>").append(newLineNo+1).append("</td>");+ builder.append("<td class='operation noselect old new'>*</td>");+ builder.append("<td class='content old new' data-old='").append(oldLineNo).append("' data-new='").append(newLineNo).append("'>");+ if (tokenDiffs.isEmpty()) {+ builder.append(" ");+ } else {+ for (DiffBlock<TextToken> tokenBlock: tokenDiffs) {+ for (TextToken token: tokenBlock.getUnits())+ builder.append(TokenUtils.toHtml(token, getOperationClass(tokenBlock.getOperation())));+ }+ }+ builder.append("</td>");+ builder.append("</tr>");+ }++ private void appendExpander(StringBuilder builder, int blockIndex, int skippedLines) {+ builder.append("<tr class='expander expander").append(blockIndex).append("'>");++ String script = String.format("javascript:$('#%s').data('callback')(%d);", getMarkupId(), blockIndex);+ builder.append("<td colspan='2' class='expander noselect'><a title='Show more lines' href=\"")+ .append(script).append("\"><i class='fa fa-sort'></i></a></td>");+ builder.append("<td colspan='2' class='skipped noselect'><i class='fa fa-ellipsis-h'></i> skipped ")+ .append(skippedLines).append(" lines <i class='fa fa-ellipsis-h'></i></td>");+ builder.append("</tr>");+ }++}diff --git a/core/src/main/java/io/onedev/server/web/component/diff/plain/PlainDiffResourceReference.java b/core/src/main/java/io/onedev/server/web/component/diff/plain/PlainDiffResourceReference.javanew file mode 100644index 0000000000..9cdbc75669--- /dev/null+++ b/core/src/main/java/io/onedev/server/web/component/diff/plain/PlainDiffResourceReference.java@@ -0,0 +1,26 @@+package io.onedev.server.web.component.diff.plain;++import java.util.List;++import org.apache.wicket.markup.head.CssHeaderItem;+import org.apache.wicket.markup.head.HeaderItem;++import io.onedev.server.web.component.diff.table.DiffTableResourceReference;+import io.onedev.server.web.page.base.BaseDependentResourceReference;++public class PlainDiffResourceReference extends BaseDependentResourceReference {++ private static final long serialVersionUID = 1L;++ public PlainDiffResourceReference() {+ super(PlainDiffResourceReference.class, "plain-diff.js");+ }++ @Override+ public List<HeaderItem> getDependencies() {+ List<HeaderItem> dependencies = super.getDependencies();+ dependencies.add(CssHeaderItem.forReference(new DiffTableResourceReference()));+ return dependencies;+ }++}diff --git a/core/src/main/java/io/onedev/server/web/component/diff/plain/plain-diff.js b/core/src/main/java/io/onedev/server/web/component/diff/plain/plain-diff.jsnew file mode 100644index 0000000000..2eff1b1fe2--- /dev/null+++ b/core/src/main/java/io/onedev/server/web/component/diff/plain/plain-diff.js@@ -0,0 +1,10 @@+onedev.server.plainDiff = {+ onDomReady: function(containerId, callback) {+ $("#" + containerId).data("callback", callback);+ },+ expand: function(containerId, blockIndex, expandedHtml) {+ var $container = $("#" + containerId);+ var $expanderTr = $container.find(".expander" + blockIndex);+ $expanderTr.replaceWith(expandedHtml);+ }+};diff --git a/core/src/main/java/io/onedev/server/web/component/diff/table/DiffTableResourceReference.java b/core/src/main/java/io/onedev/server/web/component/diff/table/DiffTableResourceReference.javanew file mode 100644index 0000000000..3630886731--- /dev/null+++ b/core/src/main/java/io/onedev/server/web/component/diff/table/DiffTableResourceReference.java@@ -0,0 +1,13 @@+package io.onedev.server.web.component.diff.table;++import io.onedev.server.web.page.base.BaseDependentCssResourceReference;++public class DiffTableResourceReference extends BaseDependentCssResourceReference {++ private static final long serialVersionUID = 1L;++ public DiffTableResourceReference() {+ super(DiffTableResourceReference.class, "diff-table.css");+ }++}diff --git a/core/src/main/java/io/onedev/server/web/component/diff/table/diff-table.css b/core/src/main/java/io/onedev/server/web/component/diff/table/diff-table.cssnew file mode 100644index 0000000000..e06f71bc50--- /dev/null+++ b/core/src/main/java/io/onedev/server/web/component/diff/table/diff-table.css@@ -0,0 +1,116 @@+table.diff {+ border: 1px solid #E0E0E0;+ position: relative;+ font-family: Consolas, "Liberation Mono", Menlo, Courier, monospace;+ font-size: 12px;+ table-layout: fixed;+ border-collapse: separate;+}++/*+ * have to use relative here as otherwise the last table row will have problem+ * focusing on expander link. This relates to negative margin top+ * specified for change class in revision diff panel+ */+table.diff>tbody>tr>td {+ position: relative;+}+table.diff>tbody>tr>td.number {+ padding: 0 4px;+ border-left: 1px solid #E0E0E0;+ text-align: right;+ font-size: 12px;+ color: #9E9E9E;+}+table.diff>tbody>tr>td.operation {+ border-left: 1px solid #E0E0E0;+}+table.diff>tbody>tr>td:FIRST-CHILD {+ border-left: none !important;+}+table.diff>tbody>tr:FIRST-CHILD>td {+ border-top: none !important;+}+table.diff>tbody>tr:LAST-CHILD>td {+ border-bottom: none !important;+}+table.diff>tbody>tr.expander>td.skipped {+ padding: 6px 16px;+ border-left: 1px solid #D8E2F2;+ background: #f4f7fb;+ color: #999;+}+table.diff>tbody>tr.expander>td.expander {+ border-left: 1px solid #D8E2F2;+ text-align: center;+}+table.diff>tbody>tr.expander>td.expander a {+ display: block;+ background: #edf2f9;+ padding: 6px 0;+ color: #888;+}+table.diff>tbody>tr.expander>td.expander>a:hover {+ background: #4078c0;+ color: white;+}+table.diff>tbody>tr>td.old.number {+ background: #ffdddd;+ border-left: 1px solid #f1c0c0;+}+table.diff>tbody>tr>td.old.content {+ background: #ffecec;+}+table.diff>tbody>tr>td.old.operation {+ border-left: 1px solid #f1c0c0;+ background: #ffecec;+}+table.diff>tbody>tr>td.old .delete {+ background-color: #F8B8B8;+ text-decoration: line-through;+}+table.diff>tbody>tr>td.new.number {+ background: #dbffdb;+ border-left: 1px solid #c1e9c1;+}+table.diff>tbody>tr>td.new.content {+ background: #eaffea;+}+table.diff>tbody>tr>td.new.operation {+ border-left: 1px solid #c1e9c1;+ background: #eaffea;+}+table.diff>tbody>tr>td.new .insert {+ background-color: #94F094;+}+table.diff>tbody>tr>td.old.new.number {+ background: #FAF3D0;+ border-left: 1px solid #EBD049;+}+table.diff>tbody>tr>td.old.new.content {+ background: #FCF8E4;+}+table.diff>tbody>tr>td.old.new.operation {+ border-left: 1px solid #EBD049;+ background: #FCF8E4;+}+table.diff>tbody>tr>td.content {+ white-space: pre-wrap;+ word-wrap: break-word;+}+table.diff>tbody>tr>td.operation {+ font-weight: bold;+ padding: 0 4px 0 4px;+}+table.diff>tbody>tr.original+.expanded>td {+ border-top: 1px solid #E8E8E8;+}+table.diff>tbody>tr.expanded+.original>td {+ border-top: 1px solid #E8E8E8;+}+table.diff>tbody>tr.expanded>td {+ background: #F9F9F9;+}+table.diff>tbody>tr:hover>td {+ background: #E8F2FE !important;+}diff --git a/core/src/main/java/io/onedev/server/web/editable/BeanDescriptor.java b/core/src/main/java/io/onedev/server/web/editable/BeanDescriptor.javaindex 36c1a3b13e..301d8d61d4 100644--- a/core/src/main/java/io/onedev/server/web/editable/BeanDescriptor.java+++ b/core/src/main/java/io/onedev/server/web/editable/BeanDescriptor.java@@ -8,6 +8,8 @@ import java.util.List;import java.util.Map;import java.util.Set;+import javax.annotation.Nullable;+import com.google.common.collect.Sets;import io.onedev.server.exception.OneException;@@ -74,6 +76,15 @@ public class BeanDescriptor implements Serializable {propertyDescriptor.copyProperty(from, to);}}++ @Nullable+ public PropertyDescriptor getPropertyDescriptor(String propertyName) {+ for (PropertyDescriptor propertyDescriptor: getPropertyDescriptors()) {+ if (propertyDescriptor.getPropertyName().equals(propertyName))+ return propertyDescriptor;+ }+ return null;+ }public Object newBeanInstance() {try {diff --git a/core/src/main/java/io/onedev/server/web/editable/BeanEditor.java b/core/src/main/java/io/onedev/server/web/editable/BeanEditor.javaindex 44d74f4420..c3b32b658b 100644--- a/core/src/main/java/io/onedev/server/web/editable/BeanEditor.java+++ b/core/src/main/java/io/onedev/server/web/editable/BeanEditor.java@@ -260,12 +260,7 @@ public class BeanEditor extends ValueEditor<Serializable> {@Overrideprotected void onConfigure() {super.onConfigure();- setVisible(propertyContext.isPropertyVisible(this) && !propertyContext.isExcluded());- }-- @Override- public PropertyContext<?> getPropertyContext(String propertyName) {- return BeanEditor.this.getPropertyContext(propertyName);+ setVisible(propertyContext.isPropertyVisible(new ComponentContext(this), beanDescriptor) && !propertyContext.isExcluded());}};@@ -273,8 +268,8 @@ public class BeanEditor extends ValueEditor<Serializable> {return item;}- public PropertyContext<?> getPropertyContext(String propertyName) {- for (PropertyContext<?> propertyContext: propertyContexts) {+ public PropertyContext<Serializable> getPropertyContext(String propertyName) {+ for (PropertyContext<Serializable> propertyContext: propertyContexts) {if (propertyContext.getPropertyName().equals(propertyName))return propertyContext;}@@ -319,7 +314,7 @@ public class BeanEditor extends ValueEditor<Serializable> {int propertyIndex = (int) item.getDefaultModelObject();PropertyContext<Serializable> propertyContext = propertyContexts.get(propertyIndex);if (propertyContext.getPropertyName().equals(property.getName())- && propertyContext.isPropertyVisible((PropertyContextAware) item)+ && propertyContext.isPropertyVisible(new ComponentContext(item), beanDescriptor)&& !propertyContext.isExcluded()) {found = true;break;@@ -347,6 +342,20 @@ public class BeanEditor extends ValueEditor<Serializable> {return beanDescriptor;}+ public List<PropertyContext<Serializable>> getPropertyContexts() {+ return propertyContexts;+ }++ public OneContext getOneContext(String propertyName) {+ for (Component item: propertiesView) {+ int propertyIndex = (int) item.getDefaultModelObject();+ PropertyContext<Serializable> propertyContext = propertyContexts.get(propertyIndex);+ if (propertyContext.getPropertyName().equals(propertyName))+ return new ComponentContext(item);+ }+ throw new RuntimeException("Property not found: " + propertyName);+ }+@Overridepublic ErrorContext getErrorContext(PathSegment pathSegment) {final PathSegment.Property property = (Property) pathSegment;@@ -381,7 +390,7 @@ public class BeanEditor extends ValueEditor<Serializable> {return bean;}- private abstract class PropertyContainer extends WebMarkupContainer implements EditContext, PropertyContextAware {+ private abstract class PropertyContainer extends WebMarkupContainer implements EditContext {public PropertyContainer(String id, int propertyIndex) {super(id, Model.of(propertyIndex));diff --git a/core/src/main/java/io/onedev/server/web/editable/BeanViewer.java b/core/src/main/java/io/onedev/server/web/editable/BeanViewer.javaindex e514182251..aef8f8c0cf 100644--- a/core/src/main/java/io/onedev/server/web/editable/BeanViewer.java+++ b/core/src/main/java/io/onedev/server/web/editable/BeanViewer.java@@ -17,9 +17,10 @@ import org.apache.wicket.model.Model;import io.onedev.server.util.EditContext;import io.onedev.server.util.editable.annotation.OmitName;+import io.onedev.server.web.util.ComponentContext;@SuppressWarnings("serial")-public class BeanViewer extends Panel implements PropertyContextAware, EditContext {+public class BeanViewer extends Panel implements EditContext {private final BeanDescriptor beanDescriptor;@@ -66,7 +67,7 @@ public class BeanViewer extends Panel implements PropertyContextAware, EditConteSerializable propertyValue = (Serializable) propertyContext.getPropertyValue(bean);valueTd.add(propertyContext.renderForView("content", Model.of(propertyValue)));- item.setVisible(propertyContext.isPropertyVisible(BeanViewer.this) && !propertyContext.isExcluded());+ item.setVisible(propertyContext.isPropertyVisible(new ComponentContext(BeanViewer.this), beanDescriptor) && !propertyContext.isExcluded());item.add(AttributeAppender.append("class", "property-" + propertyContext.getPropertyName()));}@@ -77,18 +78,13 @@ public class BeanViewer extends Panel implements PropertyContextAware, EditConte}@Override- public PropertyContext<?> getPropertyContext(String propertyName) {+ public Object getInputValue(String name) {+ String propertyName = beanDescriptor.getPropertyName(name);for (PropertyContext<?> propertyContext: propertyContexts) {if (propertyContext.getPropertyName().equals(propertyName))- return propertyContext;+ return propertyContext.getPropertyValue(getDefaultModelObject());}throw new RuntimeException("Property not found: " + propertyName);}-- @Override- public Object getInputValue(String name) {- String propertyName = beanDescriptor.getPropertyName(name);- return getPropertyContext(propertyName).getPropertyValue(getDefaultModelObject());- }}diff --git a/core/src/main/java/io/onedev/server/web/editable/PropertyContextAware.java b/core/src/main/java/io/onedev/server/web/editable/PropertyContextAware.javadeleted file mode 100644index bec2c20143..0000000000--- a/core/src/main/java/io/onedev/server/web/editable/PropertyContextAware.java+++ /dev/null@@ -1,7 +0,0 @@-package io.onedev.server.web.editable;--public interface PropertyContextAware {-- PropertyContext<?> getPropertyContext(String propertyName);--}diff --git a/core/src/main/java/io/onedev/server/web/editable/PropertyDescriptor.java b/core/src/main/java/io/onedev/server/web/editable/PropertyDescriptor.javaindex 0f9f98f051..8730498a9b 100644--- a/core/src/main/java/io/onedev/server/web/editable/PropertyDescriptor.java+++ b/core/src/main/java/io/onedev/server/web/editable/PropertyDescriptor.java@@ -113,23 +113,23 @@ public class PropertyDescriptor implements Serializable {|| getPropertyGetter().getAnnotation(Size.class) != null && getPropertyGetter().getAnnotation(Size.class).min()>=1;}- public boolean isPropertyVisible(PropertyContextAware propertyContextAware) {- return isPropertyVisible(propertyContextAware, new HashSet<>());+ public boolean isPropertyVisible(OneContext oneContext, BeanDescriptor beanDescriptor) {+ return isPropertyVisible(oneContext, beanDescriptor, new HashSet<>());}- public boolean isPropertyVisible(PropertyContextAware propertyContextAware, Set<String> checkedPropertyNames) {+ public boolean isPropertyVisible(OneContext oneContext, BeanDescriptor beanDescriptor, Set<String> checkedPropertyNames) {if (checkedPropertyNames.contains(getPropertyName()))return true;checkedPropertyNames.add(getPropertyName());- OneContext.push(new ComponentContext((Component) propertyContextAware));+ OneContext.push(oneContext);try {ShowCondition showCondition = getPropertyGetter().getAnnotation(ShowCondition.class);if (showCondition != null && !(boolean)ReflectionUtils.invokeStaticMethod(getBeanClass(), showCondition.value()))return false;for (String propertyName: getDependencyPropertyNames()) {- PropertyContext<?> propertyContext = propertyContextAware.getPropertyContext(propertyName);- if (!propertyContext.isPropertyVisible(propertyContextAware, checkedPropertyNames))+ PropertyDescriptor propertyDescriptor = beanDescriptor.getPropertyDescriptor(propertyName);+ if (!propertyDescriptor.isPropertyVisible(oneContext, beanDescriptor, checkedPropertyNames))return false;}return true;diff --git a/core/src/main/java/io/onedev/server/web/page/base/base.css b/core/src/main/java/io/onedev/server/web/page/base/base.cssindex 20bd005d13..8908146494 100644--- a/core/src/main/java/io/onedev/server/web/page/base/base.css+++ b/core/src/main/java/io/onedev/server/web/page/base/base.css@@ -397,6 +397,9 @@ a.fa {table {width: 100%;}+table>tbody>tr>td {+ vertical-align: top;+}table.table>thead>tr>th>a {color: black;text-decoration: underline;diff --git a/core/src/main/java/io/onedev/server/web/page/project/issues/issuedetail/IssueDetailPage.html b/core/src/main/java/io/onedev/server/web/page/project/issues/issuedetail/IssueDetailPage.htmlindex 60ee1497d9..96930172bd 100644--- a/core/src/main/java/io/onedev/server/web/page/project/issues/issuedetail/IssueDetailPage.html+++ b/core/src/main/java/io/onedev/server/web/page/project/issues/issuedetail/IssueDetailPage.html@@ -1,42 +1,46 @@<wicket:extend><div id="issue-detail" class="clearfix"><div class="primary pull-left">- <div class="number-and-title">- <span wicket:id="number"></span>+ <div wicket:id="title" class="title clearfix"><span wicket:id="title"></span>+ <a wicket:id="edit" title="Edit title" class="edit"><i class="fa fa-pencil"></i></a>+ <form wicket:id="form" class="pull-left form-inline">+ <input wicket:id="title" type="text" placeholder="Input title" class="form-control"></input>+ <input wicket:id="save" type="submit" value="Save" class="btn btn-primary"/>+ <input wicket:id="cancel" type="button" value="Cancel" class="btn btn-default"/>+ </form></div><div class="state-and-actions clearfix"><span wicket:id="state" class="state label pull-left"></span>- <div class="actions pull-left">+ <div class="transition-actions pull-left"><wicket:enclosure child="transitions"><span class="btn-group"><a wicket:id="transitions" class="btn btn-default btn-sm"><span wicket:id="label"></span></a></span></wicket:enclosure>- <span class="btn-group">- <a wicket:id="edit" class="btn btn-default btn-sm"><i class="fa fa-pencil"></i> Edit</a>- <a wicket:id="delete" class="btn btn-default btn-sm"><i class="fa fa-trash"></i> Delete</a>- </span>- <a wicket:id="newIssue" class="btn btn-success btn-sm"><i class="fa fa-plus"></i> New Issue</a></div>+ <a wicket:id="newIssue" class="new-issue pull-right btn btn-success btn-sm"><i class="fa fa-plus"></i> New Issue</a></div><div wicket:id="actionOptions" class="action-options"></div>- <div wicket:id="description" class="description"></div>+ <table class="activities">+ <tr wicket:id="activities">+ <td wicket:id="avatar" class="avatar"><a wicket:id="avatar"></a></td>+ <td class="spacer"></td>+ <td wicket:id="content" class="content"></td>+ </tr>+ </table>+ <div wicket:id="addComment"></div></div><div class="additional pull-right">- <div class="submitter">- Opened by <a wicket:id="submitter"></a> <span wicket:id="submitDate"></span>- </div>- <wicket:enclosure child="fields">- <div class="fields">+ <div wicket:id="fields" class="fields"><table><tr wicket:id="fields"><td class="name"><span wicket:id="name"></span></td><td class="values"><div wicket:id="values"></div></td></tr></table>+ <a wicket:id="editFields" class="btn btn-default btn-sm"><i class="fa fa-pencil"></i> Edit</a></div>- </wicket:enclosure><div wicket:id="relations" class="relations"><label>Related Issues</label><wicket:enclosure child="relations">@@ -51,6 +55,7 @@<div wicket:id="feedback"></div></div><input wicket:id="addRelation" class="add-relation" type="hidden"></input>+ <a wicket:id="delete" class="delete btn btn-danger btn-sm"><i class="fa fa-trash"></i> Delete</a></div></div><wicket:fragment wicket:id="transitionFrag">@@ -69,4 +74,35 @@<wicket:fragment wicket:id="nonEmptyValuesFrag"><div wicket:id="values" class="value"><span wicket:id="value"></span></div></wicket:fragment>+ <wicket:fragment wicket:id="loginToCommentFrag">+ <div class="login-to-comment">+ <a wicket:id="login">Login to comment</a>+ </div>+ </wicket:fragment>+ <wicket:fragment wicket:id="addCommentFrag">+ <form wicket:id="form" class="add-comment leave-confirm no-autofocus">+ <div wicket:id="feedback"></div>+ <div wicket:id="comment" placeholder="Leave a comment"></div>+ <div class="actions">+ <a wicket:id="save" class="btn btn-primary dirty-aware">Comment</a>+ </div>+ </form>+ </wicket:fragment>+ <wicket:fragment wicket:id="fieldEditFrag">+ <form wicket:id="form" class="field-edit leave-confirm">+ <div class="modal-header">+ <button wicket:id="close" type="button" class="close">×</button>+ <h4 id="modal-title" class="modal-title">+ Edit Fields+ </h4>+ </div>+ <div class="modal-body">+ <div wicket:id="editor"></div>+ </div>+ <div class="modal-footer">+ <input wicket:id="save" type="submit" class="dirty-aware btn btn-primary" value="Save"></input>+ <a wicket:id="cancel" class="btn btn-default">Cancel</a>+ </div>+ </form>+ </wicket:fragment></wicket:extend>\ No newline at end of filediff --git a/core/src/main/java/io/onedev/server/web/page/project/issues/issuedetail/IssueDetailPage.java b/core/src/main/java/io/onedev/server/web/page/project/issues/issuedetail/IssueDetailPage.javaindex 7354e5e9ad..7a4f6157b9 100644--- a/core/src/main/java/io/onedev/server/web/page/project/issues/issuedetail/IssueDetailPage.java+++ b/core/src/main/java/io/onedev/server/web/page/project/issues/issuedetail/IssueDetailPage.java@@ -4,23 +4,32 @@ import java.io.Serializable;import java.util.ArrayList;import java.util.Collections;import java.util.Comparator;+import java.util.Date;import java.util.HashSet;import java.util.List;+import java.util.Map;import java.util.Set;import javax.annotation.Nullable;import javax.persistence.EntityNotFoundException;+import org.apache.commons.lang3.StringUtils;import org.apache.wicket.AttributeModifier;+import org.apache.wicket.Component;+import org.apache.wicket.RestartResponseAtInterceptPageException;import org.apache.wicket.ajax.AjaxRequestTarget;import org.apache.wicket.ajax.attributes.AjaxRequestAttributes;import org.apache.wicket.ajax.markup.html.AjaxLink;import org.apache.wicket.ajax.markup.html.form.AjaxButton;+import org.apache.wicket.ajax.markup.html.form.AjaxSubmitLink;+import org.apache.wicket.behavior.AttributeAppender;+import org.apache.wicket.event.IEvent;import org.apache.wicket.markup.head.CssHeaderItem;import org.apache.wicket.markup.head.IHeaderResponse;import org.apache.wicket.markup.html.WebMarkupContainer;import org.apache.wicket.markup.html.basic.Label;import org.apache.wicket.markup.html.form.Form;+import org.apache.wicket.markup.html.form.TextField;import org.apache.wicket.markup.html.link.BookmarkablePageLink;import org.apache.wicket.markup.html.link.Link;import org.apache.wicket.markup.html.list.ListItem;@@ -35,37 +44,48 @@ import org.apache.wicket.model.PropertyModel;import org.apache.wicket.request.cycle.RequestCycle;import org.apache.wicket.request.mapper.parameter.PageParameters;-import com.google.common.base.Preconditions;import com.google.common.collect.Lists;import de.agilecoders.wicket.core.markup.html.bootstrap.common.NotificationPanel;import io.onedev.server.OneDev;-import io.onedev.server.manager.IssueRelationManager;+import io.onedev.server.manager.IssueCommentManager;import io.onedev.server.manager.IssueFieldManager;import io.onedev.server.manager.IssueManager;+import io.onedev.server.manager.IssueRelationManager;import io.onedev.server.model.Issue;+import io.onedev.server.model.IssueComment;import io.onedev.server.model.IssueRelation;import io.onedev.server.model.Project;import io.onedev.server.model.User;import io.onedev.server.model.support.issue.workflow.IssueWorkflow;-import io.onedev.server.model.support.issue.workflow.StateSpec;import io.onedev.server.model.support.issue.workflow.StateTransition;+import io.onedev.server.persistence.dao.Dao;import io.onedev.server.security.SecurityUtils;-import io.onedev.server.util.DateUtils;import io.onedev.server.util.PromptedField;import io.onedev.server.util.inputspec.InputContext;import io.onedev.server.util.inputspec.InputSpec;import io.onedev.server.web.component.IssueStateLabel;+import io.onedev.server.web.component.avatar.AvatarLink;import io.onedev.server.web.component.comment.CommentInput;+import io.onedev.server.web.component.comment.ProjectAttachmentSupport;import io.onedev.server.web.component.issuechoice.SelectToAddIssue;-import io.onedev.server.web.component.link.UserLink;-import io.onedev.server.web.component.markdown.MarkdownViewer;+import io.onedev.server.web.component.markdown.AttachmentSupport;+import io.onedev.server.web.component.modal.ModalLink;+import io.onedev.server.web.component.modal.ModalPanel;import io.onedev.server.web.editable.BeanContext;+import io.onedev.server.web.editable.BeanDescriptor;+import io.onedev.server.web.editable.BeanEditor;+import io.onedev.server.web.editable.PropertyContext;+import io.onedev.server.web.editable.PropertyDescriptor;import io.onedev.server.web.page.project.ProjectPage;import io.onedev.server.web.page.project.issues.fieldvalues.FieldValuesPanel;-import io.onedev.server.web.page.project.issues.issueedit.IssueEditPage;+import io.onedev.server.web.page.project.issues.issuedetail.activity.CommentedActivity;+import io.onedev.server.web.page.project.issues.issuedetail.activity.IssueActivity;+import io.onedev.server.web.page.project.issues.issuedetail.activity.IssueCommentDeleted;+import io.onedev.server.web.page.project.issues.issuedetail.activity.OpenedActivity;import io.onedev.server.web.page.project.issues.issuelist.IssueListPage;import io.onedev.server.web.page.project.issues.newissue.NewIssuePage;+import io.onedev.server.web.page.security.LoginPage;import io.onedev.server.web.util.ConfirmOnClick;import io.onedev.server.web.util.ajaxlistener.ConfirmListener;@@ -78,6 +98,10 @@ public class IssueDetailPage extends ProjectPage implements InputContext {private final IModel<Issue> issueModel;+ private boolean editingTitle;++ private RepeatingView activitiesView;+public IssueDetailPage(PageParameters params) {super(params);@@ -103,12 +127,104 @@ public class IssueDetailPage extends ProjectPage implements InputContext {protected void onInitialize() {super.onInitialize();- add(new IssueStateLabel("state", issueModel));- add(new Label("number", "#" + getIssue().getNumber()));- add(new Label("title", getIssue().getTitle()));+ WebMarkupContainer titleContainer = new WebMarkupContainer("title");+ titleContainer.setOutputMarkupId(true);+ add(titleContainer);++ titleContainer.add(new Label("title", new AbstractReadOnlyModel<String>() {++ @Override+ public String getObject() {+ return "#" + getIssue().getNumber() + " - " + getIssue().getTitle();+ }++ }) {++ @Override+ protected void onConfigure() {+ super.onConfigure();+ setVisible(!editingTitle);+ }++ });++ titleContainer.add(new AjaxLink<Void>("edit") {++ @Override+ public void onClick(AjaxRequestTarget target) {+ editingTitle = true;++ target.add(titleContainer);+ }++ @Override+ protected void onConfigure() {+ super.onConfigure();++ setVisible(!editingTitle && SecurityUtils.canModify(getIssue()));+ }++ });++ Form<?> form = new Form<Void>("form") {++ @Override+ protected void onConfigure() {+ super.onConfigure();+ setVisible(editingTitle);+ }++ };+ titleContainer.add(form);++ form.add(new TextField<String>("title", new IModel<String>() {++ @Override+ public void detach() {+ }++ @Override+ public String getObject() {+ if (StringUtils.isNotBlank(getIssue().getTitle()))+ return getIssue().getTitle();+ else+ return "";+ }++ @Override+ public void setObject(String object) {+ getIssue().setTitle(object);+ }++ }));- add(new UserLink("submitter", User.getForDisplay(getIssue().getSubmitter(), getIssue().getSubmitterName())));- add(new Label("submitDate", DateUtils.formatAge(getIssue().getSubmitDate())));+ form.add(new AjaxButton("save") {++ @Override+ protected void onSubmit(AjaxRequestTarget target, Form<?> form) {+ super.onSubmit(target, form);++ if (StringUtils.isNotBlank(getIssue().getTitle())) {+ OneDev.getInstance(Dao.class).persist(getIssue());+ editingTitle = false;+ }++ target.add(titleContainer);+ }++ });++ form.add(new AjaxLink<Void>("cancel") {++ @Override+ public void onClick(AjaxRequestTarget target) {+ editingTitle = false;+ target.add(titleContainer);+ }++ });++ add(new IssueStateLabel("state", issueModel));RepeatingView transitionsView = new RepeatingView("transitions");@@ -161,7 +277,8 @@ public class IssueDetailPage extends ProjectPage implements InputContext {};- form.add(BeanContext.editBean("fields", fieldBean, excludedFields));+ BeanEditor editor = BeanContext.editBean("fields", fieldBean, excludedFields);+ form.add(editor);form.add(new CommentInput("comment", new PropertyModel<String>(this, "comment"), false) {@@ -183,9 +300,16 @@ public class IssueDetailPage extends ProjectPage implements InputContext {protected void onSubmit(AjaxRequestTarget target, Form<?> form) {super.onSubmit(target, form);getIssue().setState(transition.getToState());- StateSpec stateSpec = Preconditions.checkNotNull(getProject().getIssueWorkflow().getState(getIssue().getState()));Set<String> promptedFields = new HashSet<>(getIssue().getPromptedFields().keySet());- promptedFields.addAll(stateSpec.getFields());++ for (PropertyContext<?> propertyContext: editor.getPropertyContexts()) {+ if (!propertyContext.isExcluded()) {+ if (propertyContext.isPropertyVisible(editor.getOneContext(propertyContext.getPropertyName()), editor.getBeanDescriptor()))+ promptedFields.add(propertyContext.getDisplayName());+ else+ promptedFields.remove(propertyContext.getDisplayName());+ }+ }getIssueManager().save(getIssue(), fieldBean, promptedFields);setResponsePage(IssueDetailPage.class, IssueDetailPage.paramsOf(getIssue()));}@@ -216,43 +340,130 @@ public class IssueDetailPage extends ProjectPage implements InputContext {add(transitionsView);- add(new Link<Void>("edit") {+ add(new BookmarkablePageLink<Void>("newIssue", NewIssuePage.class, NewIssuePage.paramsOf(getProject())) {@Override- public void onClick() {- setResponsePage(IssueEditPage.class, IssueEditPage.paramsOf(getIssue()));+ protected void onConfigure() {+ super.onConfigure();+ setVisible(SecurityUtils.canRead(getProject()));}- }.setVisible(SecurityUtils.canModify(getIssue())));+ });- Link<Void> deleteLink = new Link<Void>("delete") {-- @Override- public void onClick() {- getIssueManager().delete(getIssue());- setResponsePage(IssueListPage.class, IssueListPage.paramsOf(getProject()));+ newEmptyActionOptions(null);++ add(activitiesView = new RepeatingView("activities"));+ activitiesView.setOutputMarkupId(true);++ Issue issue = getIssue();++ for (IssueActivity activity: getActivities()) {+ if (issue.isVisitedAfter(activity.getDate())) {+ activitiesView.add(newActivityRow(activitiesView.newChildId(), activity));+ } else {+ Component row = newActivityRow(activitiesView.newChildId(), activity);+ row.add(AttributeAppender.append("class", "new"));+ activitiesView.add(row);}+ }++ if (getLoginUser() != null) {+ Fragment fragment = new Fragment("addComment", "addCommentFrag", this);+ fragment.setOutputMarkupId(true);+ String autosaveKey = "autosave:addIssueComment:" + issue.getId();+ CommentInput input = new CommentInput("comment", Model.of(""), false) {++ @Override+ protected AttachmentSupport getAttachmentSupport() {+ return new ProjectAttachmentSupport(getProject(), getIssue().getUUID());+ }++ @Override+ protected Project getProject() {+ return IssueDetailPage.this.getProject();+ }++ @Override+ protected String getAutosaveKey() {+ return autosaveKey;+ }++ @Override+ protected List<AttributeModifier> getInputModifiers() {+ return Lists.newArrayList(AttributeModifier.replace("placeholder", "Leave a comment"));+ }++ };+ input.setRequired(true).setLabel(Model.of("Comment"));- };- deleteLink.add(new ConfirmOnClick("Do you really want to delete this issue?"));- deleteLink.setVisible(SecurityUtils.canModify(getIssue()));- add(deleteLink);+ form = new Form<Void>("form");+ form.add(new NotificationPanel("feedback", form));+ form.add(input);+ form.add(new AjaxSubmitLink("save") {++ @Override+ protected void onSubmit(AjaxRequestTarget target, Form<?> form) {+ super.onSubmit(target, form);++ IssueComment comment = new IssueComment();+ comment.setContent(input.getModelObject());+ comment.setUser(getLoginUser());+ comment.setDate(new Date());+ comment.setIssue(getIssue());+ OneDev.getInstance(IssueCommentManager.class).save(comment);++ input.setModelObject("");++ target.add(fragment);++ @SuppressWarnings("deprecation")+ Component lastActivityRow = activitiesView.get(activitiesView.size()-1);+ Component newActivityRow = newActivityRow(activitiesView.newChildId(), new CommentedActivity(comment));+ activitiesView.add(newActivityRow);++ String script = String.format("$(\"<tr id='%s'></tr>\").insertAfter('#%s');",+ newActivityRow.getMarkupId(), lastActivityRow.getMarkupId());+ target.prependJavaScript(script);+ target.add(newActivityRow);+ target.appendJavaScript(String.format("localStorage.removeItem('%s');", autosaveKey));+ }++ @Override+ protected void onError(AjaxRequestTarget target, Form<?> form) {+ super.onError(target, form);+ target.add(form);+ target.appendJavaScript(String.format("localStorage.removeItem('%s');", autosaveKey));+ }++ });+ form.setOutputMarkupId(true);+ fragment.add(form);+ add(fragment);+ } else {+ Fragment fragment = new Fragment("addComment", "loginToCommentFrag", this);+ fragment.add(new Link<Void>("login") {++ @Override+ public void onClick() {+ throw new RestartResponseAtInterceptPageException(LoginPage.class);+ }++ });+ add(fragment);+ }- add(new BookmarkablePageLink<Void>("newIssue", NewIssuePage.class, NewIssuePage.paramsOf(getProject())) {+ WebMarkupContainer fieldsContainer = new WebMarkupContainer("fields") {@Overrideprotected void onConfigure() {super.onConfigure();- setVisible(SecurityUtils.canRead(getProject()));+ setVisible(!getIssue().getFields().isEmpty());}- });-- newEmptyActionOptions(null);+ };+ fieldsContainer.setOutputMarkupId(true);- add(new MarkdownViewer("description", Model.of(getIssue().getDescription()), null));-- add(new ListView<PromptedField>("fields", new LoadableDetachableModel<List<PromptedField>>() {+ fieldsContainer.add(new ListView<PromptedField>("fields", new LoadableDetachableModel<List<PromptedField>>() {@Overrideprotected List<PromptedField> load() {@@ -261,12 +472,6 @@ public class IssueDetailPage extends ProjectPage implements InputContext {}) {- @Override- protected void onConfigure() {- super.onConfigure();- setVisible(!getIssue().getFields().isEmpty());- }-@Overrideprotected void populateItem(ListItem<PromptedField> item) {PromptedField field = item.getModelObject();@@ -275,6 +480,77 @@ public class IssueDetailPage extends ProjectPage implements InputContext {}});++ fieldsContainer.add(new ModalLink("editFields") {++ @Override+ protected Component newContent(String id, ModalPanel modal) {+ Fragment fragment = new Fragment(id, "fieldEditFrag", IssueDetailPage.this);+ Form<?> form = new Form<Void>("form");++ Serializable fieldBean = getIssueFieldManager().readFields(issue);++ Map<String, PropertyDescriptor> propertyDescriptors =+ new BeanDescriptor(fieldBean.getClass()).getMapOfDisplayNameToPropertyDescriptor();++ Set<String> excludedFields = new HashSet<>();+ for (InputSpec fieldSpec: getProject().getIssueWorkflow().getFields()) {+ if (!issue.getPromptedFields().containsKey(fieldSpec.getName()))+ excludedFields.add(propertyDescriptors.get(fieldSpec.getName()).getPropertyName());+ }++ form.add(BeanContext.editBean("editor", fieldBean, excludedFields));++ form.add(new AjaxButton("save") {++ @Override+ protected void onSubmit(AjaxRequestTarget target, Form<?> form) {+ super.onSubmit(target, form);+ new BeanDescriptor(Issue.class).copyProperties(issue, getIssue());+ getIssueFieldManager().writeFields(issue, fieldBean, issue.getPromptedFields().keySet());+ modal.close();+ target.add(fieldsContainer);+ }++ @Override+ protected void onError(AjaxRequestTarget target, Form<?> form) {+ super.onError(target, form);+ target.add(form);+ }++ });++ form.add(new AjaxLink<Void>("close") {++ @Override+ public void onClick(AjaxRequestTarget target) {+ modal.close();+ }++ });+ form.add(new AjaxLink<Void>("cancel") {++ @Override+ public void onClick(AjaxRequestTarget target) {+ modal.close();+ }++ });+ form.setOutputMarkupId(true);+ fragment.add(form);++ return fragment;+ }++ @Override+ protected void onConfigure() {+ super.onConfigure();+ setVisible(SecurityUtils.canModify(getIssue()));+ }++ });++ add(fieldsContainer);WebMarkupContainer relations = new WebMarkupContainer("relations") {@@ -411,6 +687,19 @@ public class IssueDetailPage extends ProjectPage implements InputContext {}});++ Link<Void> deleteLink = new Link<Void>("delete") {++ @Override+ public void onClick() {+ getIssueManager().delete(getIssue());+ setResponsePage(IssueListPage.class, IssueListPage.paramsOf(getProject()));+ }++ };+ deleteLink.add(new ConfirmOnClick("Do you really want to delete this issue?"));+ deleteLink.setVisible(SecurityUtils.canModify(getIssue()));+ add(deleteLink);}private void newEmptyActionOptions(@Nullable AjaxRequestTarget target) {@@ -451,6 +740,59 @@ public class IssueDetailPage extends ProjectPage implements InputContext {return params;}+ private Component newActivityRow(String id, IssueActivity activity) {+ WebMarkupContainer row = new WebMarkupContainer(id, Model.of(activity)) {++ @Override+ public void onEvent(IEvent<?> event) {+ super.onEvent(event);++ if (event.getPayload() instanceof IssueCommentDeleted) {+ IssueCommentDeleted commentRemoved = (IssueCommentDeleted) event.getPayload();+ remove();+ commentRemoved.getHandler().appendJavaScript(String.format("$('#%s').remove();", getMarkupId()));+ }+ }++ };+ row.setOutputMarkupId(true);+ String anchor = activity.getAnchor();+ if (anchor != null)+ row.setMarkupId(anchor);++ if (row.get("content") == null)+ row.add(activity.render("content"));++ WebMarkupContainer avatarColumn = new WebMarkupContainer("avatar");+ row.add(avatarColumn);++ avatarColumn.add(new AvatarLink("avatar",+ User.getForDisplay(getIssue().getSubmitter(), getIssue().getSubmitterName())));++ return row;+ }++ private List<IssueActivity> getActivities() {+ List<IssueActivity> activities = new ArrayList<>();++ activities.add(new OpenedActivity(getIssue()));++ for (IssueComment comment: getIssue().getComments()) {+ activities.add(new CommentedActivity(comment));+ }++ activities.sort((o1, o2) -> {+ if (o1.getDate().getTime()<o2.getDate().getTime())+ return -1;+ else if (o1.getDate().getTime()>o2.getDate().getTime())+ return 1;+ else+ return 1;+ });++ return activities;+ }+@Overridepublic List<String> getInputNames() {return getProject().getIssueWorkflow().getInputNames();diff --git a/core/src/main/java/io/onedev/server/web/page/project/issues/issuedetail/activity/CommentedActivity.java b/core/src/main/java/io/onedev/server/web/page/project/issues/issuedetail/activity/CommentedActivity.javanew file mode 100644index 0000000000..e38000adda--- /dev/null+++ b/core/src/main/java/io/onedev/server/web/page/project/issues/issuedetail/activity/CommentedActivity.java@@ -0,0 +1,47 @@+package io.onedev.server.web.page.project.issues.issuedetail.activity;++import java.util.Date;++import org.apache.wicket.markup.html.panel.Panel;+import org.apache.wicket.model.LoadableDetachableModel;++import io.onedev.server.OneDev;+import io.onedev.server.manager.IssueCommentManager;+import io.onedev.server.model.IssueComment;++@SuppressWarnings("serial")+public class CommentedActivity implements IssueActivity {++ private final Long commentId;++ public CommentedActivity(IssueComment comment) {+ commentId = comment.getId();+ }++ @Override+ public Panel render(String panelId) {+ return new CommentedPanel(panelId, new LoadableDetachableModel<IssueComment>() {++ @Override+ protected IssueComment load() {+ return getComment();+ }++ });+ }++ public IssueComment getComment() {+ return OneDev.getInstance(IssueCommentManager.class).load(commentId);+ }++ @Override+ public Date getDate() {+ return getComment().getDate();+ }++ @Override+ public String getAnchor() {+ return getComment().getAnchor();+ }++}diff --git a/core/src/main/java/io/onedev/server/web/page/project/issues/issuedetail/activity/CommentedPanel.html b/core/src/main/java/io/onedev/server/web/page/project/issues/issuedetail/activity/CommentedPanel.htmlnew file mode 100644index 0000000000..ad52ba85fd--- /dev/null+++ b/core/src/main/java/io/onedev/server/web/page/project/issues/issuedetail/activity/CommentedPanel.html@@ -0,0 +1,28 @@+<wicket:panel>+ <div class="comment activity">+ <div class="head clearfix">+ <div class="pull-left">+ <span wicket:id="user" class="user"></span> commented <span wicket:id="age"></span>+ </div>+ </div>+ <div wicket:id="body" class="body"></div>+ </div>+ <wicket:fragment wicket:id="viewFrag">+ <div wicket:id="content"></div>+ <div wicket:id="actions" class="actions">+ <a wicket:id="edit">Edit</a>+ <span class="middot"></span>+ <a wicket:id="delete">Delete</a>+ </div>+ </wicket:fragment>+ <wicket:fragment wicket:id="editFrag">+ <form wicket:id="form" class="leave-confirm">+ <div wicket:id="feedback" class="feedback"></div>+ <div wicket:id="input"></div>+ <div class="actions">+ <button wicket:id="save" class="btn btn-sm btn-primary dirty-aware">Save</button>+ <button wicket:id="cancel" class="btn btn-sm btn-default">Cancel</button>+ </div>+ </form>+ </wicket:fragment>+</wicket:panel>\ No newline at end of filediff --git a/core/src/main/java/io/onedev/server/web/page/project/issues/issuedetail/activity/CommentedPanel.java b/core/src/main/java/io/onedev/server/web/page/project/issues/issuedetail/activity/CommentedPanel.javanew file mode 100644index 0000000000..1677fb0f24--- /dev/null+++ b/core/src/main/java/io/onedev/server/web/page/project/issues/issuedetail/activity/CommentedPanel.java@@ -0,0 +1,206 @@+package io.onedev.server.web.page.project.issues.issuedetail.activity;++import org.apache.wicket.Component;+import org.apache.wicket.ajax.AjaxRequestTarget;+import org.apache.wicket.ajax.attributes.AjaxRequestAttributes;+import org.apache.wicket.ajax.markup.html.AjaxLink;+import org.apache.wicket.ajax.markup.html.form.AjaxSubmitLink;+import org.apache.wicket.event.Broadcast;+import org.apache.wicket.markup.html.WebMarkupContainer;+import org.apache.wicket.markup.html.basic.Label;+import org.apache.wicket.markup.html.form.Form;+import org.apache.wicket.markup.html.panel.Fragment;+import org.apache.wicket.markup.html.panel.GenericPanel;+import org.apache.wicket.model.IModel;+import org.apache.wicket.model.Model;+import org.hibernate.StaleStateException;++import de.agilecoders.wicket.core.markup.html.bootstrap.common.NotificationPanel;+import io.onedev.server.OneDev;+import io.onedev.server.manager.IssueCommentManager;+import io.onedev.server.model.IssueComment;+import io.onedev.server.model.Project;+import io.onedev.server.model.User;+import io.onedev.server.security.SecurityUtils;+import io.onedev.server.util.DateUtils;+import io.onedev.server.web.component.comment.CommentInput;+import io.onedev.server.web.component.comment.ProjectAttachmentSupport;+import io.onedev.server.web.component.link.UserLink;+import io.onedev.server.web.component.markdown.AttachmentSupport;+import io.onedev.server.web.component.markdown.ContentVersionSupport;+import io.onedev.server.web.component.markdown.MarkdownViewer;+import io.onedev.server.web.util.ajaxlistener.ConfirmLeaveListener;+import io.onedev.server.web.util.ajaxlistener.ConfirmListener;++@SuppressWarnings("serial")+class CommentedPanel extends GenericPanel<IssueComment> {++ public CommentedPanel(String id, IModel<IssueComment> model) {+ super(id, model);+ }++ @Override+ protected void onInitialize() {+ super.onInitialize();++ add(new UserLink("user", User.getForDisplay(getComment().getUser(), getComment().getUserName())));+ add(new Label("age", DateUtils.formatAge(getComment().getDate())));++ add(newViewer());++ setOutputMarkupId(true);+ }++ private Component newViewer() {+ Fragment viewer = new Fragment("body", "viewFrag", this);++ ContentVersionSupport contentVersionSuppport;+ if (SecurityUtils.canModify(getComment())) {+ contentVersionSuppport = new ContentVersionSupport() {++ @Override+ public long getVersion() {+ return getComment().getVersion();+ }++ };+ } else {+ contentVersionSuppport = null;+ }+ viewer.add(new MarkdownViewer("content", new IModel<String>() {++ @Override+ public String getObject() {+ return getComment().getContent();+ }++ @Override+ public void detach() {+ }++ @Override+ public void setObject(String object) {+ getComment().setContent(object);+ OneDev.getInstance(IssueCommentManager.class).save(getComment());+ }++ }, contentVersionSuppport));++ WebMarkupContainer actions = new WebMarkupContainer("actions");+ actions.setVisible(SecurityUtils.canModify(getComment()));++ actions.add(new AjaxLink<Void>("edit") {++ @Override+ public void onClick(AjaxRequestTarget target) {+ Fragment editor = new Fragment("body", "editFrag", CommentedPanel.this);++ Form<?> form = new Form<Void>("form");+ form.setOutputMarkupId(true);+ editor.add(form);+ NotificationPanel feedback = new NotificationPanel("feedback", form);+ feedback.setOutputMarkupPlaceholderTag(true);+ form.add(feedback);+ String autosaveKey = "autosave:editIssueComment:" + getComment().getId();+ CommentInput input = new CommentInput("input", Model.of(getComment().getContent()), false) {++ @Override+ protected AttachmentSupport getAttachmentSupport() {+ return new ProjectAttachmentSupport(getProject(), getComment().getIssue().getUUID());+ }++ @Override+ protected String getAutosaveKey() {+ return autosaveKey;+ }++ @Override+ protected Project getProject() {+ return getComment().getIssue().getProject();+ }++ };+ input.setRequired(true).setLabel(Model.of("Comment"));+ form.add(input);++ final long lastVersion = getComment().getVersion();+ form.add(new AjaxSubmitLink("save") {++ @Override+ protected void onSubmit(AjaxRequestTarget target, Form<?> form) {+ IssueComment comment = getComment();+ try {+ if (comment.getVersion() != lastVersion)+ throw new StaleStateException("");+ comment.setContent(input.getModelObject());+ OneDev.getInstance(IssueCommentManager.class).save(comment);++ Component viewer = newViewer();+ editor.replaceWith(viewer);+ target.add(viewer);+ target.appendJavaScript(String.format("localStorage.removeItem('%s');", autosaveKey));+ } catch (StaleStateException e) {+ error("Some one changed the content you are editing. Reload the page and try again.");+ target.add(feedback);+ }+ }++ @Override+ protected void onError(AjaxRequestTarget target, Form<?> form) {+ super.onError(target, form);+ target.add(feedback);+ }++ });++ form.add(new AjaxLink<Void>("cancel") {++ @Override+ protected void updateAjaxAttributes(AjaxRequestAttributes attributes) {+ super.updateAjaxAttributes(attributes);+ attributes.getAjaxCallListeners().add(new ConfirmLeaveListener(form));+ }++ @Override+ public void onClick(AjaxRequestTarget target) {+ Component viewer = newViewer();+ editor.replaceWith(viewer);+ target.add(viewer);+ }++ });++ editor.setOutputMarkupId(true);+ viewer.replaceWith(editor);+ target.add(editor);+ }++ });++ actions.add(new AjaxLink<Void>("delete") {++ @Override+ public void onClick(AjaxRequestTarget target) {+ OneDev.getInstance(IssueCommentManager.class).delete(getComment());+ send(CommentedPanel.this, Broadcast.BUBBLE, new IssueCommentDeleted(target));+ }++ @Override+ protected void updateAjaxAttributes(AjaxRequestAttributes attributes) {+ super.updateAjaxAttributes(attributes);+ attributes.getAjaxCallListeners().add(new ConfirmListener("Do you really want to delete this comment?"));+ }++ });++ viewer.add(actions);+ viewer.setOutputMarkupId(true);++ return viewer;+ }++ private IssueComment getComment() {+ return getModelObject();+ }++}diff --git a/core/src/main/java/io/onedev/server/web/page/project/issues/issuedetail/activity/IssueActivity.java b/core/src/main/java/io/onedev/server/web/page/project/issues/issuedetail/activity/IssueActivity.javanew file mode 100644index 0000000000..6f80132733--- /dev/null+++ b/core/src/main/java/io/onedev/server/web/page/project/issues/issuedetail/activity/IssueActivity.java@@ -0,0 +1,18 @@+package io.onedev.server.web.page.project.issues.issuedetail.activity;++import java.io.Serializable;+import java.util.Date;++import javax.annotation.Nullable;++import org.apache.wicket.markup.html.panel.Panel;++public interface IssueActivity extends Serializable {++ Date getDate();++ Panel render(String panelId);++ @Nullable+ String getAnchor();+}diff --git a/core/src/main/java/io/onedev/server/web/page/project/issues/issuedetail/activity/IssueCommentDeleted.java b/core/src/main/java/io/onedev/server/web/page/project/issues/issuedetail/activity/IssueCommentDeleted.javanew file mode 100644index 0000000000..b200905758--- /dev/null+++ b/core/src/main/java/io/onedev/server/web/page/project/issues/issuedetail/activity/IssueCommentDeleted.java@@ -0,0 +1,13 @@+package io.onedev.server.web.page.project.issues.issuedetail.activity;++import org.apache.wicket.ajax.AjaxRequestTarget;++import io.onedev.server.web.util.AjaxPayload;++public class IssueCommentDeleted extends AjaxPayload {++ public IssueCommentDeleted(AjaxRequestTarget target) {+ super(target);+ }++}diff --git a/core/src/main/java/io/onedev/server/web/page/project/issues/issuedetail/activity/OpenedActivity.java b/core/src/main/java/io/onedev/server/web/page/project/issues/issuedetail/activity/OpenedActivity.javanew file mode 100644index 0000000000..a01ad543c7--- /dev/null+++ b/core/src/main/java/io/onedev/server/web/page/project/issues/issuedetail/activity/OpenedActivity.java@@ -0,0 +1,47 @@+package io.onedev.server.web.page.project.issues.issuedetail.activity;++import java.util.Date;++import org.apache.wicket.markup.html.panel.Panel;+import org.apache.wicket.model.LoadableDetachableModel;++import io.onedev.server.OneDev;+import io.onedev.server.manager.IssueManager;+import io.onedev.server.model.Issue;++@SuppressWarnings("serial")+public class OpenedActivity implements IssueActivity {++ private final Long issueId;++ public OpenedActivity(Issue issue) {+ issueId = issue.getId();+ }++ @Override+ public Panel render(String panelId) {+ return new OpenedPanel(panelId, new LoadableDetachableModel<Issue>() {++ @Override+ protected Issue load() {+ return getIssue();+ }++ });+ }++ public Issue getIssue() {+ return OneDev.getInstance(IssueManager.class).load(issueId);+ }++ @Override+ public Date getDate() {+ return getIssue().getSubmitDate();+ }++ @Override+ public String getAnchor() {+ return null;+ }++}diff --git a/core/src/main/java/io/onedev/server/web/page/project/issues/issuedetail/activity/OpenedPanel.html b/core/src/main/java/io/onedev/server/web/page/project/issues/issuedetail/activity/OpenedPanel.htmlnew file mode 100644index 0000000000..11dae5c6c4--- /dev/null+++ b/core/src/main/java/io/onedev/server/web/page/project/issues/issuedetail/activity/OpenedPanel.html@@ -0,0 +1,24 @@+<wicket:panel>+ <div class="open activity">+ <div class="head">+ <span wicket:id="user" class="user"></span> opened <span wicket:id="age"></span>+ </div>+ <div wicket:id="body" class="body"></div>+ </div>+ <wicket:fragment wicket:id="viewFrag">+ <div wicket:id="content"></div>+ <div wicket:id="actions" class="actions">+ <a wicket:id="edit">Edit</a>+ </div>+ </wicket:fragment>+ <wicket:fragment wicket:id="editFrag">+ <form wicket:id="form" class="leave-confirm">+ <div wicket:id="feedback" class="feedback"></div>+ <div wicket:id="input"></div>+ <div class="actions">+ <button wicket:id="save" class="btn btn-sm btn-primary dirty-aware">Save</button>+ <button wicket:id="cancel" class="btn btn-sm btn-default">Cancel</button>+ </div>+ </form>+ </wicket:fragment>+</wicket:panel>\ No newline at end of filediff --git a/core/src/main/java/io/onedev/server/web/page/project/issues/issuedetail/activity/OpenedPanel.java b/core/src/main/java/io/onedev/server/web/page/project/issues/issuedetail/activity/OpenedPanel.javanew file mode 100644index 0000000000..71e51219f8--- /dev/null+++ b/core/src/main/java/io/onedev/server/web/page/project/issues/issuedetail/activity/OpenedPanel.java@@ -0,0 +1,193 @@+package io.onedev.server.web.page.project.issues.issuedetail.activity;++import org.apache.commons.lang3.StringUtils;+import org.apache.wicket.Component;+import org.apache.wicket.ajax.AjaxRequestTarget;+import org.apache.wicket.ajax.attributes.AjaxRequestAttributes;+import org.apache.wicket.ajax.markup.html.AjaxLink;+import org.apache.wicket.ajax.markup.html.form.AjaxButton;+import org.apache.wicket.markup.html.WebMarkupContainer;+import org.apache.wicket.markup.html.basic.Label;+import org.apache.wicket.markup.html.form.Form;+import org.apache.wicket.markup.html.panel.Fragment;+import org.apache.wicket.markup.html.panel.GenericPanel;+import org.apache.wicket.model.IModel;+import org.apache.wicket.model.Model;+import org.hibernate.StaleStateException;++import de.agilecoders.wicket.core.markup.html.bootstrap.common.NotificationPanel;+import io.onedev.server.OneDev;+import io.onedev.server.manager.IssueManager;+import io.onedev.server.model.Issue;+import io.onedev.server.model.Project;+import io.onedev.server.model.User;+import io.onedev.server.persistence.dao.Dao;+import io.onedev.server.security.SecurityUtils;+import io.onedev.server.util.DateUtils;+import io.onedev.server.web.component.comment.CommentInput;+import io.onedev.server.web.component.comment.ProjectAttachmentSupport;+import io.onedev.server.web.component.link.UserLink;+import io.onedev.server.web.component.markdown.AttachmentSupport;+import io.onedev.server.web.component.markdown.ContentVersionSupport;+import io.onedev.server.web.component.markdown.MarkdownViewer;+import io.onedev.server.web.util.ajaxlistener.ConfirmLeaveListener;++@SuppressWarnings("serial")+class OpenedPanel extends GenericPanel<Issue> {++ public OpenedPanel(String id, IModel<Issue> model) {+ super(id, model);+ }++ private Component newViewer() {+ Fragment viewer = new Fragment("body", "viewFrag", this);++ String description = getIssue().getDescription();+ if (StringUtils.isNotBlank(description)) {+ ContentVersionSupport contentVersionSupport;+ if (SecurityUtils.canModify(getIssue())) {+ contentVersionSupport = new ContentVersionSupport() {++ @Override+ public long getVersion() {+ return getIssue().getVersion();+ }++ };+ } else {+ contentVersionSupport = null;+ }+ viewer.add(new MarkdownViewer("content", new IModel<String>() {++ @Override+ public String getObject() {+ return getIssue().getDescription();+ }++ @Override+ public void detach() {+ }++ @Override+ public void setObject(String object) {+ getIssue().setDescription(object);+ OneDev.getInstance(IssueManager.class).save(getIssue());+ }++ }, contentVersionSupport));+ } else {+ viewer.add(new Label("content", "<i>No description</i>").setEscapeModelStrings(false));+ }++ WebMarkupContainer actions = new WebMarkupContainer("actions");+ actions.setVisible(SecurityUtils.canModify(getIssue()));+ actions.add(new AjaxLink<Void>("edit") {++ @Override+ public void onClick(AjaxRequestTarget target) {+ Fragment editor = new Fragment("body", "editFrag", OpenedPanel.this);++ Form<?> form = new Form<Void>("form");+ form.setOutputMarkupId(true);+ editor.add(form);++ NotificationPanel feedback = new NotificationPanel("feedback", form);+ feedback.setOutputMarkupPlaceholderTag(true);+ form.add(feedback);++ String autosaveKey = "autosave:editIssueDescription:" + getIssue().getId();+ long lastVersion = getIssue().getVersion();+ CommentInput input = new CommentInput("input", Model.of(getIssue().getDescription()), false) {++ @Override+ protected AttachmentSupport getAttachmentSupport() {+ return new ProjectAttachmentSupport(getIssue().getProject(), getIssue().getUUID());+ }++ @Override+ protected String getAutosaveKey() {+ return autosaveKey;+ }++ @Override+ protected Project getProject() {+ return getIssue().getProject();+ }++ };+ form.add(input);++ form.add(new AjaxButton("save") {++ @Override+ protected void onError(AjaxRequestTarget target, Form<?> form) {+ super.onError(target, form);+ target.add(feedback);+ }++ @Override+ protected void onSubmit(AjaxRequestTarget target, Form<?> form) {+ try {+ if (getIssue().getVersion() != lastVersion)+ throw new StaleStateException("");+ getIssue().setDescription(input.getModelObject());+ OneDev.getInstance(Dao.class).persist(getIssue());++ Component viewer = newViewer();+ editor.replaceWith(viewer);+ target.add(viewer);+ target.appendJavaScript(String.format("localStorage.removeItem('%s');", autosaveKey));+ } catch (StaleStateException e) {+ error("Some one changed the content you are editing. Reload the page and try again.");+ target.add(feedback);+ }+ }++ });++ form.add(new AjaxLink<Void>("cancel") {++ @Override+ protected void updateAjaxAttributes(AjaxRequestAttributes attributes) {+ super.updateAjaxAttributes(attributes);+ attributes.getAjaxCallListeners().add(new ConfirmLeaveListener(form));+ }++ @Override+ public void onClick(AjaxRequestTarget target) {+ Component viewer = newViewer();+ editor.replaceWith(viewer);+ target.add(viewer);+ }++ });++ editor.setOutputMarkupId(true);+ viewer.replaceWith(editor);+ target.add(editor);+ }++ });++ viewer.add(actions);++ viewer.setOutputMarkupId(true);+ return viewer;+ }++ @Override+ protected void onInitialize() {+ super.onInitialize();++ Issue issue = getIssue();+ add(new UserLink("user", User.getForDisplay(issue.getSubmitter(), issue.getSubmitterName())));+ add(new Label("age", DateUtils.formatAge(issue.getSubmitDate())));++ add(newViewer());+ }++ private Issue getIssue() {+ return getModelObject();+ }++}diff --git a/core/src/main/java/io/onedev/server/web/page/project/issues/issuedetail/issue-detail.css b/core/src/main/java/io/onedev/server/web/page/project/issues/issuedetail/issue-detail.cssindex 05f111085e..0d9e2b0e19 100644--- a/core/src/main/java/io/onedev/server/web/page/project/issues/issuedetail/issue-detail.css+++ b/core/src/main/java/io/onedev/server/web/page/project/issues/issuedetail/issue-detail.css@@ -4,18 +4,58 @@#issue-detail>.primary>div {margin-bottom: 20px;}-#issue-detail>.primary>.number-and-title {+#issue-detail>.primary>.title {font-size: 20px;font-weight: bold;+ color: #444;+ position: relative;+}+#issue-detail>.primary>.title a {+ color: #999;+}+#issue-detail>.primary>.title input[type=text] {+ width: 600px;+ font-weight: normal;}#issue-detail>.primary>.state-and-actions>.state {font-size: 20px;font-weight: normal;margin-right: 20px;}--#issue-detail>.primary>.state-and-actions>.actions>* {- margin-right: 8px;+#issue-detail>.primary .activities>tbody>tr>td {+ border-top: 1px solid #EEE;+ padding: 16px 0;+}+#issue-detail>.primary .activities>tbody>tr>td.avatar {+ width: 40px;+}+#issue-detail>.primary .activities>tbody>tr>td.avatar .avatar {+ width: 40px;+ height: 40px;+}+#issue-detail>.primary .activities>tbody>tr>td.spacer {+ width: 20px;+}+#issue-detail>.primary .activities .activity>.head {+ color: #888;+}+#issue-detail>.primary .activities .activity>.body {+ margin-top: 8px;+}+#issue-detail>.primary .activities .activity>.body>.actions {+ margin-top: 8px;+}+#issue-detail>.primary .activities .activity>.body>.actions a {+ color: #888;+}+#issue-detail>.primary .login-to-comment {+ border: 1px solid #EEE;+ vertical-align: center;+ text-align: center;+ padding: 20px;+ font-size: 20px;+ background: #F9F9F9;+ border-radius: 4px;}#issue-detail>.additional {@@ -40,6 +80,7 @@#issue-detail>.additional .fields td {padding-bottom: 10px;+ vertical-align: middle;}#issue-detail>.additional .fields tr:last-child td {padding-bottom: 0;@@ -55,6 +96,9 @@border-radius: 3px;padding: 3px 6px 3px 0;}+#issue-detail>.additional .fields>a {+ margin-top: 12px;+}#issue-detail>.additional .relations label {margin-bottom: 10px;diff --git a/core/src/main/java/io/onedev/server/web/page/project/issues/issueedit/IssueEditPage.html b/core/src/main/java/io/onedev/server/web/page/project/issues/issueedit/IssueEditPage.htmldeleted file mode 100644index 48f5881332..0000000000--- a/core/src/main/java/io/onedev/server/web/page/project/issues/issueedit/IssueEditPage.html+++ /dev/null@@ -1,12 +0,0 @@-<wicket:extend>- <div id="issue-edit">- <form wicket:id="form">- <div wicket:id="builtin"></div>- <div wicket:id="fields"></div>- <div class="actions">- <button wicket:id="save" type="submit" class="btn btn-primary dirty-aware">Save</button>- <a wicket:id="cancel" class="btn btn-default">Cancel</a>- </div>- </form>- </div>-</wicket:extend>\ No newline at end of filediff --git a/core/src/main/java/io/onedev/server/web/page/project/issues/issueedit/IssueEditPage.java b/core/src/main/java/io/onedev/server/web/page/project/issues/issueedit/IssueEditPage.javadeleted file mode 100644index 2d03249d50..0000000000--- a/core/src/main/java/io/onedev/server/web/page/project/issues/issueedit/IssueEditPage.java+++ /dev/null@@ -1,127 +0,0 @@-package io.onedev.server.web.page.project.issues.issueedit;--import java.io.Serializable;-import java.util.HashSet;-import java.util.List;-import java.util.Map;-import java.util.Set;--import org.apache.wicket.markup.html.form.Button;-import org.apache.wicket.markup.html.form.Form;-import org.apache.wicket.markup.html.link.Link;-import org.apache.wicket.model.IModel;-import org.apache.wicket.model.LoadableDetachableModel;-import org.apache.wicket.request.mapper.parameter.PageParameters;--import io.onedev.server.OneDev;-import io.onedev.server.manager.IssueFieldManager;-import io.onedev.server.manager.IssueManager;-import io.onedev.server.model.Issue;-import io.onedev.server.util.inputspec.InputContext;-import io.onedev.server.util.inputspec.InputSpec;-import io.onedev.server.web.editable.BeanContext;-import io.onedev.server.web.editable.BeanDescriptor;-import io.onedev.server.web.editable.PropertyDescriptor;-import io.onedev.server.web.page.project.ProjectPage;-import io.onedev.server.web.page.project.issues.issuedetail.IssueDetailPage;--@SuppressWarnings("serial")-public class IssueEditPage extends ProjectPage implements InputContext {-- public static final String PARAM_ISSUE = "issue";-- private final IModel<Issue> issueModel;-- public IssueEditPage(PageParameters params) {- super(params);-- issueModel = new LoadableDetachableModel<Issue>() {-- @Override- protected Issue load() {- return getIssueManager().load(params.get(PARAM_ISSUE).toLong());- }-- };- }-- private IssueManager getIssueManager() {- return OneDev.getInstance(IssueManager.class);- }-- private IssueFieldManager getIssueFieldManager() {- return OneDev.getInstance(IssueFieldManager.class);- }-- private Issue getIssue() {- return issueModel.getObject();- }-- @Override- protected void onInitialize() {- super.onInitialize();-- Form<?> form = new Form<Void>("form");-- Issue issue = getIssue();- form.add(BeanContext.editBean("builtin", issue));-- Serializable fieldBean = getIssueFieldManager().readFields(issue);-- Map<String, PropertyDescriptor> propertyDescriptors =- new BeanDescriptor(fieldBean.getClass()).getMapOfDisplayNameToPropertyDescriptor();-- Set<String> excludedFields = new HashSet<>();- for (InputSpec fieldSpec: getProject().getIssueWorkflow().getFields()) {- if (!issue.getPromptedFields().containsKey(fieldSpec.getName()))- excludedFields.add(propertyDescriptors.get(fieldSpec.getName()).getPropertyName());- }-- form.add(BeanContext.editBean("fields", fieldBean, excludedFields));-- form.add(new Button("save") {-- @Override- public void onSubmit() {- super.onSubmit();- new BeanDescriptor(Issue.class).copyProperties(issue, getIssue());- getIssueManager().save(getIssue(), fieldBean, issue.getPromptedFields().keySet());-- setResponsePage(IssueDetailPage.class, IssueDetailPage.paramsOf(getIssue()));- }-- });-- form.add(new Link<Void>("cancel") {-- @Override- public void onClick() {- setResponsePage(IssueDetailPage.class, IssueDetailPage.paramsOf(getIssue()));- }-- });- add(form);- }-- public static PageParameters paramsOf(Issue issue) {- PageParameters params = ProjectPage.paramsOf(issue.getProject());- params.set(PARAM_ISSUE, issue.getId());- return params;- }-- @Override- public List<String> getInputNames() {- return getProject().getIssueWorkflow().getInputNames();- }-- @Override- public InputSpec getInput(String inputName) {- return getProject().getIssueWorkflow().getInput(inputName);- }-- @Override- public boolean isReservedName(String inputName) {- throw new UnsupportedOperationException();- }--}diff --git a/core/src/main/java/io/onedev/server/web/page/project/issues/issueedit/IssueEditResourceReference.java b/core/src/main/java/io/onedev/server/web/page/project/issues/issueedit/IssueEditResourceReference.javadeleted file mode 100644index 8ca564ede8..0000000000--- a/core/src/main/java/io/onedev/server/web/page/project/issues/issueedit/IssueEditResourceReference.java+++ /dev/null@@ -1,13 +0,0 @@-package io.onedev.server.web.page.project.issues.issueedit;--import io.onedev.server.web.page.base.BaseDependentCssResourceReference;--public class IssueEditResourceReference extends BaseDependentCssResourceReference {-- private static final long serialVersionUID = 1L;-- public IssueEditResourceReference() {- super(IssueEditResourceReference.class, "issue-edit.css");- }--}diff --git a/core/src/main/java/io/onedev/server/web/page/project/issues/issueedit/issue-edit.css b/core/src/main/java/io/onedev/server/web/page/project/issues/issueedit/issue-edit.cssdeleted file mode 100644index 62c87139b4..0000000000--- a/core/src/main/java/io/onedev/server/web/page/project/issues/issueedit/issue-edit.css+++ /dev/null@@ -1,3 +0,0 @@-#issue-edit {--}\ No newline at end of filediff --git a/core/src/main/java/io/onedev/server/web/page/project/pullrequests/requestdetail/RequestDetailPage.html b/core/src/main/java/io/onedev/server/web/page/project/pullrequests/requestdetail/RequestDetailPage.htmlindex 90aee88e36..f3bbb6e6c2 100644--- a/core/src/main/java/io/onedev/server/web/page/project/pullrequests/requestdetail/RequestDetailPage.html+++ b/core/src/main/java/io/onedev/server/web/page/project/pullrequests/requestdetail/RequestDetailPage.html@@ -2,7 +2,6 @@<div id="request-detail"><div wicket:id="requestHead" class="head clearfix"><div wicket:id="title" class="title pull-left"></div>- <div wicket:id="number" class="number pull-left"></div><a wicket:id="editLink" title="Edit title" class="edit"><i class="fa fa-pencil"></i></a><form wicket:id="editForm" class="pull-left form-inline"><input wicket:id="title" type="text" placeholder="Input title" class="form-control"></input>diff --git a/core/src/main/java/io/onedev/server/web/page/project/pullrequests/requestdetail/RequestDetailPage.java b/core/src/main/java/io/onedev/server/web/page/project/pullrequests/requestdetail/RequestDetailPage.javaindex 0bb82fb57b..e2dd21bc1f 100644--- a/core/src/main/java/io/onedev/server/web/page/project/pullrequests/requestdetail/RequestDetailPage.java+++ b/core/src/main/java/io/onedev/server/web/page/project/pullrequests/requestdetail/RequestDetailPage.java@@ -140,15 +140,15 @@ public abstract class RequestDetailPage extends ProjectPage {PullRequest request = getPullRequest();- WebMarkupContainer requestTitle = new WebMarkupContainer("requestHead");- requestTitle.setOutputMarkupId(true);- add(requestTitle);+ WebMarkupContainer requestHead = new WebMarkupContainer("requestHead");+ requestHead.setOutputMarkupId(true);+ add(requestHead);- requestTitle.add(new Label("title", new AbstractReadOnlyModel<String>() {+ requestHead.add(new Label("title", new AbstractReadOnlyModel<String>() {@Overridepublic String getObject() {- return getPullRequest().getTitle();+ return "#" + getPullRequest().getNumber() + " - " + getPullRequest().getTitle();}}) {@@ -161,23 +161,13 @@ public abstract class RequestDetailPage extends ProjectPage {});- requestTitle.add(new Label("number", "#" + request.getNumber()) {-- @Override- protected void onConfigure() {- super.onConfigure();- setVisible(!editingTitle);- }-- });-- requestTitle.add(new AjaxLink<Void>("editLink") {+ requestHead.add(new AjaxLink<Void>("editLink") {@Overridepublic void onClick(AjaxRequestTarget target) {editingTitle = true;- target.add(requestTitle);+ target.add(requestHead);}@Override@@ -198,7 +188,7 @@ public abstract class RequestDetailPage extends ProjectPage {}};- requestTitle.add(form);+ requestHead.add(form);form.add(new TextField<String>("title", new IModel<String>() {@@ -232,7 +222,7 @@ public abstract class RequestDetailPage extends ProjectPage {editingTitle = false;}- target.add(requestTitle);+ target.add(requestHead);target.appendJavaScript("$(window).resize();");}@@ -243,7 +233,7 @@ public abstract class RequestDetailPage extends ProjectPage {@Overridepublic void onClick(AjaxRequestTarget target) {editingTitle = false;- target.add(requestTitle);+ target.add(requestHead);target.appendJavaScript("$(window).resize();");}diff --git a/core/src/main/java/io/onedev/server/web/page/project/pullrequests/requestdetail/overview/RequestOverviewPage.java b/core/src/main/java/io/onedev/server/web/page/project/pullrequests/requestdetail/overview/RequestOverviewPage.javaindex da9d895b7b..3875df4c5e 100644--- a/core/src/main/java/io/onedev/server/web/page/project/pullrequests/requestdetail/overview/RequestOverviewPage.java+++ b/core/src/main/java/io/onedev/server/web/page/project/pullrequests/requestdetail/overview/RequestOverviewPage.java@@ -367,6 +367,7 @@ public class RequestOverviewPage extends RequestDetailPage {protected void onError(AjaxRequestTarget target, Form<?> form) {super.onError(target, form);target.add(form);+ target.appendJavaScript(String.format("localStorage.removeItem('%s');", autosaveKey));}});diff --git a/core/src/main/java/io/onedev/server/web/page/project/pullrequests/requestdetail/overview/activity/ReferencedActivity.java b/core/src/main/java/io/onedev/server/web/page/project/pullrequests/requestdetail/overview/activity/ReferencedActivity.javaindex 9aadb81117..6a2b7a4125 100644--- a/core/src/main/java/io/onedev/server/web/page/project/pullrequests/requestdetail/overview/activity/ReferencedActivity.java+++ b/core/src/main/java/io/onedev/server/web/page/project/pullrequests/requestdetail/overview/activity/ReferencedActivity.java@@ -34,6 +34,7 @@ public class ReferencedActivity implements PullRequestActivity {private PullRequestReference getReference() {return OneDev.getInstance(PullRequestReferenceManager.class).load(referenceId);}+@Overridepublic Date getDate() {return getReference().getDate();diff --git a/core/src/main/java/io/onedev/server/web/page/project/pullrequests/requestlist/request-list.css b/core/src/main/java/io/onedev/server/web/page/project/pullrequests/requestlist/request-list.cssindex df3ef6d13d..4dc61ccfe4 100644--- a/core/src/main/java/io/onedev/server/web/page/project/pullrequests/requestlist/request-list.css+++ b/core/src/main/java/io/onedev/server/web/page/project/pullrequests/requestlist/request-list.css@@ -14,7 +14,6 @@}#request-list td.result {border: 2px solid #E0E0E0;- vertical-align: top;}#request-list td.request {color: #888;diff --git a/core/src/main/java/io/onedev/server/web/page/test/TestPage.html b/core/src/main/java/io/onedev/server/web/page/test/TestPage.htmlindex 795b443f3a..3b5b1a4c3b 100644--- a/core/src/main/java/io/onedev/server/web/page/test/TestPage.html+++ b/core/src/main/java/io/onedev/server/web/page/test/TestPage.html@@ -1,3 +1,4 @@<wicket:extend><a wicket:id="test">test</a>+ <div wicket:id="diffs"></div></wicket:extend>\ No newline at end of filediff --git a/core/src/main/java/io/onedev/server/web/page/test/TestPage.java b/core/src/main/java/io/onedev/server/web/page/test/TestPage.javaindex 627344f955..6726ea641a 100644--- a/core/src/main/java/io/onedev/server/web/page/test/TestPage.java+++ b/core/src/main/java/io/onedev/server/web/page/test/TestPage.java@@ -1,7 +1,12 @@package io.onedev.server.web.page.test;+import java.util.List;+import org.apache.wicket.markup.html.link.Link;+import com.google.common.collect.Lists;++import io.onedev.server.web.component.diff.plain.PlainDiffPanel;import io.onedev.server.web.page.base.BasePage;@SuppressWarnings("serial")@@ -17,6 +22,28 @@ public class TestPage extends BasePage {}});++ List<String> oldLines = Lists.newArrayList(+ "1",+ "2",+ "3",+ "4",+ "5",+ "6",+ "7",+ "8 81 82 83 84 85",+ "9");+ List<String> newLines = Lists.newArrayList(+ "1",+ "2",+ "3",+ "4",+ "5",+ "6",+ "7",+ "80 81 82 83 84 85",+ "9");+ add(new PlainDiffPanel("diffs", oldLines, newLines));}}diff --git a/core/src/main/java/io/onedev/server/web/util/markdown/IssueProcessor.java b/core/src/main/java/io/onedev/server/web/util/markdown/IssueProcessor.javaindex 56abb2a524..402716e69f 100644--- a/core/src/main/java/io/onedev/server/web/util/markdown/IssueProcessor.java+++ b/core/src/main/java/io/onedev/server/web/util/markdown/IssueProcessor.java@@ -13,7 +13,7 @@ public class IssueProcessor extends IssueParser implements MarkdownProcessor {@Overridepublic void process(Project project, Document document, Object context) {- parseIssues(project, document);+ parseReferences(project, document);}@Overridediff --git a/core/src/main/java/io/onedev/server/web/util/markdown/PullRequestProcessor.java b/core/src/main/java/io/onedev/server/web/util/markdown/PullRequestProcessor.javaindex 0130941f27..d906f725f7 100644--- a/core/src/main/java/io/onedev/server/web/util/markdown/PullRequestProcessor.java+++ b/core/src/main/java/io/onedev/server/web/util/markdown/PullRequestProcessor.java@@ -13,7 +13,7 @@ public class PullRequestProcessor extends PullRequestParser implements MarkdownP@Overridepublic void process(Project project, Document document, Object context) {- parseRequests(project, document);+ parseReferences(project, document);}@Override