The Unified and Autonomous Development Platform
Able to show incompatibilities since upgraded version even after first display
Robin Shen9c18cacf4a49
diff --git a/server-core/src/main/java/io/onedev/server/web/page/help/IncompatibilitiesPage.html b/server-core/src/main/java/io/onedev/server/web/page/help/IncompatibilitiesPage.htmlindex 0278f089c8..dfacf38118 100644--- a/server-core/src/main/java/io/onedev/server/web/page/help/IncompatibilitiesPage.html+++ b/server-core/src/main/java/io/onedev/server/web/page/help/IncompatibilitiesPage.html@@ -2,7 +2,7 @@<div class="m-2 m-sm-5 card"><div class="card-body"><div wicket:id="warning" class="alert alert-warning mb-5">- There are incompatibilities since your upgraded version.+ <wicket:svg href="warning" class="icon"/> There are incompatibilities since your upgraded version</div><div wicket:id="incompatibilities"></div><wicket:enclosure>diff --git a/server-core/src/main/java/io/onedev/server/web/page/help/IncompatibilitiesPage.java b/server-core/src/main/java/io/onedev/server/web/page/help/IncompatibilitiesPage.javaindex 55daa2e77e..3c4d330304 100644--- a/server-core/src/main/java/io/onedev/server/web/page/help/IncompatibilitiesPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/help/IncompatibilitiesPage.java@@ -22,23 +22,33 @@ import io.onedev.server.web.page.layout.LayoutPage;@SuppressWarnings("serial")public class IncompatibilitiesPage extends LayoutPage {+ private static final String FILE_CHECKED_INCOMPATIBILITIES_SINCE_UPGRADED_VERSION =+ "checked-incompatibilities-since-upgraded-version.md";+private final IModel<String> incompatibilitiesSinceUpgradedVersionModel = new LoadableDetachableModel<String>() {@Overrideprotected String load() {- File incompatibilitiesSinceUpgradedVersionFile =- new File(Bootstrap.installDir, Upgrade.FILE_INCOMPATIBILITIES_SINCE_UPGRADED_VERSION);- if (incompatibilitiesSinceUpgradedVersionFile.exists()) {- try {+ try {+ File incompatibilitiesSinceUpgradedVersionFile =+ new File(Bootstrap.installDir, Upgrade.FILE_INCOMPATIBILITIES_SINCE_UPGRADED_VERSION);+ File checkedIncompatibilitiesSinceUpgradedVersionFile =+ new File(Bootstrap.installDir, FILE_CHECKED_INCOMPATIBILITIES_SINCE_UPGRADED_VERSION);+ if (incompatibilitiesSinceUpgradedVersionFile.exists()) {String incompatibilitiesSinceUpgradedVersion = FileUtils.readFileToString(incompatibilitiesSinceUpgradedVersionFile, StandardCharsets.UTF_8);+ FileUtils.copyFile(incompatibilitiesSinceUpgradedVersionFile,+ checkedIncompatibilitiesSinceUpgradedVersionFile);FileUtils.deleteFile(incompatibilitiesSinceUpgradedVersionFile);return incompatibilitiesSinceUpgradedVersion;- } catch (IOException e) {- throw new RuntimeException(e);+ } else if (checkedIncompatibilitiesSinceUpgradedVersionFile.exists()) {+ return FileUtils.readFileToString(+ checkedIncompatibilitiesSinceUpgradedVersionFile, StandardCharsets.UTF_8);+ } else {+ return null;}- } else {- return null;+ } catch (IOException e) {+ throw new RuntimeException(e);}}