fix #2478 update admin upgrade page

This commit is contained in:
Shinsuke Sugaya 2020-09-01 06:50:10 +09:00
parent 5b568e4cb9
commit 33fe3e8e5f
2 changed files with 34 additions and 0 deletions

View file

@ -78,6 +78,8 @@ public class AdminUpgradeAction extends FessAdminAction {
private static final String VERSION_13_7 = "13.7";
private static final String VERSION_13_8 = "13.8";
// ===================================================================================
// Attribute
//
@ -160,6 +162,7 @@ public class AdminUpgradeAction extends FessAdminAction {
upgradeFrom13_5();
upgradeFrom13_6();
upgradeFrom13_7();
upgradeFrom13_8();
upgradeFromAll();
saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL));
@ -185,6 +188,7 @@ public class AdminUpgradeAction extends FessAdminAction {
upgradeFrom13_5();
upgradeFrom13_6();
upgradeFrom13_7();
upgradeFrom13_8();
upgradeFromAll();
saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL));
@ -209,6 +213,7 @@ public class AdminUpgradeAction extends FessAdminAction {
upgradeFrom13_5();
upgradeFrom13_6();
upgradeFrom13_7();
upgradeFrom13_8();
upgradeFromAll();
saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL));
@ -232,6 +237,7 @@ public class AdminUpgradeAction extends FessAdminAction {
upgradeFrom13_5();
upgradeFrom13_6();
upgradeFrom13_7();
upgradeFrom13_8();
upgradeFromAll();
saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL));
@ -254,6 +260,7 @@ public class AdminUpgradeAction extends FessAdminAction {
upgradeFrom13_5();
upgradeFrom13_6();
upgradeFrom13_7();
upgradeFrom13_8();
upgradeFromAll();
saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL));
@ -275,6 +282,7 @@ public class AdminUpgradeAction extends FessAdminAction {
upgradeFrom13_5();
upgradeFrom13_6();
upgradeFrom13_7();
upgradeFrom13_8();
upgradeFromAll();
saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL));
@ -295,6 +303,7 @@ public class AdminUpgradeAction extends FessAdminAction {
upgradeFrom13_5();
upgradeFrom13_6();
upgradeFrom13_7();
upgradeFrom13_8();
upgradeFromAll();
saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL));
@ -314,6 +323,7 @@ public class AdminUpgradeAction extends FessAdminAction {
upgradeFrom13_5();
upgradeFrom13_6();
upgradeFrom13_7();
upgradeFrom13_8();
upgradeFromAll();
saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL));
@ -332,6 +342,7 @@ public class AdminUpgradeAction extends FessAdminAction {
upgradeFrom13_5();
upgradeFrom13_6();
upgradeFrom13_7();
upgradeFrom13_8();
upgradeFromAll();
saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL));
@ -349,6 +360,7 @@ public class AdminUpgradeAction extends FessAdminAction {
upgradeFrom13_5();
upgradeFrom13_6();
upgradeFrom13_7();
upgradeFrom13_8();
upgradeFromAll();
saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL));
@ -365,6 +377,7 @@ public class AdminUpgradeAction extends FessAdminAction {
upgradeFrom13_5();
upgradeFrom13_6();
upgradeFrom13_7();
upgradeFrom13_8();
upgradeFromAll();
saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL));
@ -380,6 +393,7 @@ public class AdminUpgradeAction extends FessAdminAction {
upgradeFrom13_5();
upgradeFrom13_6();
upgradeFrom13_7();
upgradeFrom13_8();
upgradeFromAll();
saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL));
@ -394,6 +408,7 @@ public class AdminUpgradeAction extends FessAdminAction {
upgradeFrom13_5();
upgradeFrom13_6();
upgradeFrom13_7();
upgradeFrom13_8();
upgradeFromAll();
saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL));
@ -407,6 +422,7 @@ public class AdminUpgradeAction extends FessAdminAction {
try {
upgradeFrom13_6();
upgradeFrom13_7();
upgradeFrom13_8();
upgradeFromAll();
saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL));
@ -419,6 +435,19 @@ public class AdminUpgradeAction extends FessAdminAction {
} else if (VERSION_13_7.equals(form.targetVersion)) {
try {
upgradeFrom13_7();
upgradeFrom13_8();
upgradeFromAll();
saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL));
systemHelper.reloadConfiguration();
} catch (final Exception e) {
logger.warn("Failed to upgrade data.", e);
saveError(messages -> messages.addErrorsFailedToUpgradeFrom(GLOBAL, VERSION_13_5, e.getLocalizedMessage()));
}
} else if (VERSION_13_8.equals(form.targetVersion)) {
try {
upgradeFrom13_8();
upgradeFromAll();
saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL));
@ -511,6 +540,10 @@ public class AdminUpgradeAction extends FessAdminAction {
// nothing
}
private void upgradeFrom13_8() {
// nothing
}
private void upgradeFromAll() {
// nothing
}

View file

@ -66,6 +66,7 @@
<la:option value="13.5">13.5</la:option>
<la:option value="13.6">13.6</la:option>
<la:option value="13.7">13.7</la:option>
<la:option value="13.8">13.8</la:option>
</la:select>
</div>
</div>