The Unified and Autonomous Development Platform
Add migration logic for latest model changes
Robin Shen70a656ed952e
diff --git a/core/src/main/java/io/onedev/server/migration/DatabaseMigrator.java b/core/src/main/java/io/onedev/server/migration/DatabaseMigrator.javaindex fe7cc00b29..3a8f8c9d46 100644--- a/core/src/main/java/io/onedev/server/migration/DatabaseMigrator.java+++ b/core/src/main/java/io/onedev/server/migration/DatabaseMigrator.java@@ -144,7 +144,7 @@ public class DatabaseMigrator {}}- private void migrateIntegrationStrategy(Element integrationStrategyElement) {+ private void migrateIntegrationStrategy8(Element integrationStrategyElement) {if (integrationStrategyElement != null) {integrationStrategyElement.setName("mergeStrategy");switch (integrationStrategyElement.getText()) {@@ -197,14 +197,14 @@ public class DatabaseMigrator {Element assigneeElement = element.element("assignee");if (assigneeElement != null)assigneeElement.detach();- migrateIntegrationStrategy(element.element("integrationStrategy"));+ migrateIntegrationStrategy8(element.element("integrationStrategy"));Element lastIntegrationPreviewElement = element.element("lastIntegrationPreview");if (lastIntegrationPreviewElement != null) {lastIntegrationPreviewElement.setName("lastMergePreview");Element integratedElement = lastIntegrationPreviewElement.element("integrated");if (integratedElement != null)integratedElement.setName("merged");- migrateIntegrationStrategy(lastIntegrationPreviewElement.element("integrationStrategy"));+ migrateIntegrationStrategy8(lastIntegrationPreviewElement.element("integrationStrategy"));}Element closeInfoElement = element.element("closeInfo");if (closeInfoElement != null) {@@ -472,6 +472,26 @@ public class DatabaseMigrator {}}+ private void migrateMergeStrategy16(Element mergeStrategyElement) {+ if (mergeStrategyElement != null) {+ mergeStrategyElement.setName("mergeStrategy");+ switch (mergeStrategyElement.getText()) {+ case "ALWAYS_MERGE":+ mergeStrategyElement.setText("CREATE_MERGE_COMMIT");+ break;+ case "MERGE_IF_NECESSARY":+ mergeStrategyElement.setText("CREATE_MERGE_COMMIT_IF_NECESSARY");+ break;+ case "SQUASH_MERGE":+ mergeStrategyElement.setText("SQUASH_SOURCE_BRANCH_COMMITS");+ break;+ case "REBASE_MERGE":+ mergeStrategyElement.setText("REBASE_SOURCE_BRANCH_COMMITS");+ break;+ }+ }+ }+/** Migrate from 1.0 to 2.0*/@@ -803,6 +823,12 @@ public class DatabaseMigrator {} else if (file.getName().startsWith("PullRequests.xml")) {VersionedDocument dom = VersionedDocument.fromFile(file);for (Element element: dom.getRootElement().elements()) {+ migrateMergeStrategy16(element.element("mergeStrategy"));+ Element lastMergePreviewElement = element.element("lastMergePreview");+ if (lastMergePreviewElement != null) {+ migrateMergeStrategy16(lastMergePreviewElement.element("mergeStrategy"));+ }+Integer commentCount = requestCommentCounts.get(element.elementTextTrim("id"));if (commentCount == null)commentCount = 0;@@ -896,6 +922,12 @@ public class DatabaseMigrator {ignoreElement.setText(String.valueOf(!Boolean.parseBoolean(ignoreElement.getTextTrim())));}dom.writeToFile(file, false);+ } else if (file.getName().startsWith("PullRequestUpdates.xml")) {+ VersionedDocument dom = VersionedDocument.fromFile(file);+ for (Element element: dom.getRootElement().elements()) {+ element.element("uuid").detach();+ }+ dom.writeToFile(file, false);} else if (file.getName().startsWith("Projects.xml")) {VersionedDocument dom = VersionedDocument.fromFile(file);for (Element element: dom.getRootElement().elements()) {diff --git a/core/src/main/java/io/onedev/server/web/page/project/pullrequests/newrequest/NewRequestPage.html b/core/src/main/java/io/onedev/server/web/page/project/pullrequests/newrequest/NewRequestPage.htmlindex 739be22797..24f92b0509 100644--- a/core/src/main/java/io/onedev/server/web/page/project/pullrequests/newrequest/NewRequestPage.html+++ b/core/src/main/java/io/onedev/server/web/page/project/pullrequests/newrequest/NewRequestPage.html@@ -4,25 +4,25 @@<div class="body"><table class="branches"><tr>- <td class="source branch">- <div class="title">- <label>From</label>+ <td class="target branch">+ <div class="title clearfix">+ <label class="pull-left">Target</label></div>- <div wicket:id="source" class="selector"></div>+ <div wicket:id="target" class="selector"></div><div class="message">- <a wicket:id="sourceCommitLink"><span wicket:id="message"></span></a>+ <a wicket:id="targetCommitLink"><span wicket:id="message"></span></a></div></td><td class="action"><a wicket:id="swap" class="swap btn btn-default" title="Swap"><i class="fa fa-exchange"></i></a></td>- <td class="target branch">- <div class="title clearfix">- <label class="pull-left">To</label>+ <td class="source branch">+ <div class="title">+ <label>Source</label></div>- <div wicket:id="target" class="selector"></div>+ <div wicket:id="source" class="selector"></div><div class="message">- <a wicket:id="targetCommitLink"><span wicket:id="message"></span></a>+ <a wicket:id="sourceCommitLink"><span wicket:id="message"></span></a></div></td></tr>diff --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 142ff88955..747f4079bd 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@@ -13,8 +13,8 @@<div wicket:id="statusAndBranches" class="status-and-branches clearfix"><div wicket:id="status" class="label pull-left status"></div><div class="pull-left branches">- <a wicket:id="user"></a> wants to merge <a wicket:id="source" class="branch"></a> into- <a wicket:id="target" class="branch"></a> <span wicket:id="date"></span>+ <a wicket:id="user"></a> wants to merge into <a wicket:id="target" class="branch"></a>+ from <a wicket:id="source" class="branch"></a> <span wicket:id="date"></span></div></div><div wicket:id="requestSummary" class="summary">