The Unified and Autonomous Development Platform
Fix minor issue on commit graph
Robin Shen59a1443aa61d
diff --git a/core/src/main/java/io/onedev/server/manager/impl/DefaultBuildManager.java b/core/src/main/java/io/onedev/server/manager/impl/DefaultBuildManager.javaindex 0575066ae0..8962c10825 100644--- a/core/src/main/java/io/onedev/server/manager/impl/DefaultBuildManager.java+++ b/core/src/main/java/io/onedev/server/manager/impl/DefaultBuildManager.java@@ -227,7 +227,7 @@ public class DefaultBuildManager extends AbstractEntityManager<Build> implements@Transactional@Overridepublic void cleanupBuilds(Configuration configuration) {- configuration.getBuildCleanupStrategy().cleanup(configuration, getSession());+ configuration.getBuildCleanupRule().cleanup(configuration, getSession());}@Listendiff --git a/core/src/main/java/io/onedev/server/model/Configuration.java b/core/src/main/java/io/onedev/server/model/Configuration.javaindex 7c6f94fd97..adb17c196c 100644--- a/core/src/main/java/io/onedev/server/model/Configuration.java+++ b/core/src/main/java/io/onedev/server/model/Configuration.java@@ -12,12 +12,13 @@ import javax.persistence.ManyToOne;import javax.persistence.OneToMany;import javax.persistence.Table;import javax.persistence.UniqueConstraint;+import javax.validation.constraints.NotNull;import org.hibernate.annotations.Cache;import org.hibernate.annotations.CacheConcurrencyStrategy;import org.hibernate.validator.constraints.NotEmpty;-import io.onedev.server.model.support.configuration.BuildCleanupStrategy;+import io.onedev.server.model.support.configuration.BuildCleanupRule;import io.onedev.server.model.support.configuration.DoNotCleanup;import io.onedev.server.util.facade.ConfigurationFacade;import io.onedev.server.util.validation.annotation.CommitHash;@@ -45,7 +46,7 @@ public class Configuration extends AbstractEntity {private String baseCommit;- private BuildCleanupStrategy buildCleanupStrategy = new DoNotCleanup();+ private BuildCleanupRule buildCleanupRule = new DoNotCleanup();@OneToMany(mappedBy="configuration", cascade=CascadeType.REMOVE)private Collection<PullRequestBuild> pullRequestBuilds = new ArrayList<>();@@ -85,12 +86,13 @@ public class Configuration extends AbstractEntity {@Editable(order=300, description="Optionally specify build cleanup strategy to improvement OneDev performance. "+ "Note that this cleanup will not affect builds at build server side")- public BuildCleanupStrategy getBuildCleanupStrategy() {- return buildCleanupStrategy;+ @NotNull+ public BuildCleanupRule getBuildCleanupRule() {+ return buildCleanupRule;}- public void setBuildCleanupStrategy(BuildCleanupStrategy buildCleanupStrategy) {- this.buildCleanupStrategy = buildCleanupStrategy;+ public void setBuildCleanupRule(BuildCleanupRule buildCleanupRule) {+ this.buildCleanupRule = buildCleanupRule;}public Collection<PullRequestBuild> getPullRequestBuilds() {diff --git a/core/src/main/java/io/onedev/server/model/support/configuration/BuildCleanupStrategy.java b/core/src/main/java/io/onedev/server/model/support/configuration/BuildCleanupRule.javasimilarity index 82%rename from core/src/main/java/io/onedev/server/model/support/configuration/BuildCleanupStrategy.javarename to core/src/main/java/io/onedev/server/model/support/configuration/BuildCleanupRule.javaindex b160d9130e..4827ea6933 100644--- a/core/src/main/java/io/onedev/server/model/support/configuration/BuildCleanupStrategy.java+++ b/core/src/main/java/io/onedev/server/model/support/configuration/BuildCleanupRule.java@@ -8,7 +8,7 @@ import io.onedev.server.model.Configuration;import io.onedev.server.web.editable.annotation.Editable;@Editable-public interface BuildCleanupStrategy extends Serializable {+public interface BuildCleanupRule extends Serializable {void cleanup(Configuration configuration, Session session);diff --git a/core/src/main/java/io/onedev/server/model/support/configuration/DoNotCleanup.java b/core/src/main/java/io/onedev/server/model/support/configuration/DoNotCleanup.javaindex 3bec2cebce..7420e2c59b 100644--- a/core/src/main/java/io/onedev/server/model/support/configuration/DoNotCleanup.java+++ b/core/src/main/java/io/onedev/server/model/support/configuration/DoNotCleanup.java@@ -6,7 +6,7 @@ import io.onedev.server.model.Configuration;import io.onedev.server.web.editable.annotation.Editable;@Editable(order=50, name="Do not clean up")-public class DoNotCleanup implements BuildCleanupStrategy {+public class DoNotCleanup implements BuildCleanupRule {private static final long serialVersionUID = 1L;diff --git a/core/src/main/java/io/onedev/server/model/support/configuration/KeepByCount.java b/core/src/main/java/io/onedev/server/model/support/configuration/KeepByCount.javaindex 6faf022ce7..c344bb1d21 100644--- a/core/src/main/java/io/onedev/server/model/support/configuration/KeepByCount.java+++ b/core/src/main/java/io/onedev/server/model/support/configuration/KeepByCount.java@@ -17,7 +17,7 @@ import io.onedev.server.model.Configuration;import io.onedev.server.web.editable.annotation.Editable;@Editable(order=200, name="Keep builds by count")-public class KeepByCount implements BuildCleanupStrategy {+public class KeepByCount implements BuildCleanupRule {private static final long serialVersionUID = 1L;diff --git a/core/src/main/java/io/onedev/server/model/support/configuration/KeepByDays.java b/core/src/main/java/io/onedev/server/model/support/configuration/KeepByDays.javaindex 5822fadd21..43ecc68c40 100644--- a/core/src/main/java/io/onedev/server/model/support/configuration/KeepByDays.java+++ b/core/src/main/java/io/onedev/server/model/support/configuration/KeepByDays.java@@ -17,7 +17,7 @@ import io.onedev.server.model.Configuration;import io.onedev.server.web.editable.annotation.Editable;@Editable(order=100, name="Keep builds by days")-public class KeepByDays implements BuildCleanupStrategy {+public class KeepByDays implements BuildCleanupRule {private static final long serialVersionUID = 1L;diff --git a/core/src/main/java/io/onedev/server/web/component/commitgraph/commit-graph.js b/core/src/main/java/io/onedev/server/web/component/commitgraph/commit-graph.jsindex 2e1dd378ca..713d067378 100644--- a/core/src/main/java/io/onedev/server/web/component/commitgraph/commit-graph.js+++ b/core/src/main/java/io/onedev/server/web/component/commitgraph/commit-graph.js@@ -1,8 +1,8 @@onedev.server.commitGraph = {render: function(containerId, commits) {- var $container = $("#" + containerId);- $container.prepend("<svg class='commit-graph'></svg>");- var $graph = $container.children("svg");+ var $commitList = $("#" + containerId + ">ul");+ $commitList.before("<svg class='commit-graph'></svg>");+ var $graph = $commitList.prev("svg");onedev.server.commitGraph.populateData($graph, commits);onedev.server.commitGraph.drawGraph($graph);diff --git a/core/src/main/java/io/onedev/server/web/page/project/setting/configuration/ConfigurationListPage.java b/core/src/main/java/io/onedev/server/web/page/project/setting/configuration/ConfigurationListPage.javaindex 7b558d8815..8d90603b79 100644--- a/core/src/main/java/io/onedev/server/web/page/project/setting/configuration/ConfigurationListPage.java+++ b/core/src/main/java/io/onedev/server/web/page/project/setting/configuration/ConfigurationListPage.java@@ -156,7 +156,7 @@ public class ConfigurationListPage extends ProjectSettingPage {@Overrideprotected void onConfigure() {super.onConfigure();- setVisible(!(rowModel.getObject().getBuildCleanupStrategy() instanceof DoNotCleanup));+ setVisible(!(rowModel.getObject().getBuildCleanupRule() instanceof DoNotCleanup));}});