0ct0pu5/fess
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix #2464 update admin upgrade page

Browse source
This commit is contained in:
Shinsuke Sugaya 2020-06-24 06:49:25 +09:00
parent a0c17d2e85
commit efff31229b
2 changed files with 33 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
src/main/java/org/codelibs/fess/app/web/admin/upgrade/AdminUpgradeAction.java
View file

@ -76,6 +76,8 @@ public class AdminUpgradeAction extends FessAdminAction {
private static final String VERSION_13_6 = "13.6";
private static final String VERSION_13_7 = "13.7";
// ===================================================================================
// Attribute
//
@ -157,6 +159,7 @@ public class AdminUpgradeAction extends FessAdminAction {
upgradeFrom13_4();
upgradeFrom13_5();
upgradeFrom13_6();
upgradeFrom13_7();
upgradeFromAll();
saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL));
@ -181,6 +184,7 @@ public class AdminUpgradeAction extends FessAdminAction {
upgradeFrom13_4();
upgradeFrom13_5();
upgradeFrom13_6();
upgradeFrom13_7();
upgradeFromAll();
saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL));
@ -204,6 +208,7 @@ public class AdminUpgradeAction extends FessAdminAction {
upgradeFrom13_4();
upgradeFrom13_5();
upgradeFrom13_6();
upgradeFrom13_7();
upgradeFromAll();
saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL));
@ -226,6 +231,7 @@ public class AdminUpgradeAction extends FessAdminAction {
upgradeFrom13_4();
upgradeFrom13_5();
upgradeFrom13_6();
upgradeFrom13_7();
upgradeFromAll();
saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL));
@ -247,6 +253,7 @@ public class AdminUpgradeAction extends FessAdminAction {
upgradeFrom13_4();
upgradeFrom13_5();
upgradeFrom13_6();
upgradeFrom13_7();
upgradeFromAll();
saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL));
@ -267,6 +274,7 @@ public class AdminUpgradeAction extends FessAdminAction {
upgradeFrom13_4();
upgradeFrom13_5();
upgradeFrom13_6();
upgradeFrom13_7();
upgradeFromAll();
saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL));
@ -286,6 +294,7 @@ public class AdminUpgradeAction extends FessAdminAction {
upgradeFrom13_4();
upgradeFrom13_5();
upgradeFrom13_6();
upgradeFrom13_7();
upgradeFromAll();
saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL));
@ -304,6 +313,7 @@ public class AdminUpgradeAction extends FessAdminAction {
upgradeFrom13_4();
upgradeFrom13_5();
upgradeFrom13_6();
upgradeFrom13_7();
upgradeFromAll();
saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL));
@ -321,6 +331,7 @@ public class AdminUpgradeAction extends FessAdminAction {
upgradeFrom13_4();
upgradeFrom13_5();
upgradeFrom13_6();
upgradeFrom13_7();
upgradeFromAll();
saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL));
@ -337,6 +348,7 @@ public class AdminUpgradeAction extends FessAdminAction {
upgradeFrom13_4();
upgradeFrom13_5();
upgradeFrom13_6();
upgradeFrom13_7();
upgradeFromAll();
saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL));
@ -352,6 +364,7 @@ public class AdminUpgradeAction extends FessAdminAction {
upgradeFrom13_4();
upgradeFrom13_5();
upgradeFrom13_6();
upgradeFrom13_7();
upgradeFromAll();
saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL));
@ -366,6 +379,7 @@ public class AdminUpgradeAction extends FessAdminAction {
upgradeFrom13_4();
upgradeFrom13_5();
upgradeFrom13_6();
upgradeFrom13_7();
upgradeFromAll();
saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL));
@ -379,6 +393,7 @@ public class AdminUpgradeAction extends FessAdminAction {
try {
upgradeFrom13_5();
upgradeFrom13_6();
upgradeFrom13_7();
upgradeFromAll();
saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL));
@ -391,6 +406,19 @@ public class AdminUpgradeAction extends FessAdminAction {
} else if (VERSION_13_6.equals(form.targetVersion)) {
try {
upgradeFrom13_6();
upgradeFrom13_7();
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_7.equals(form.targetVersion)) {
try {
upgradeFrom13_7();
upgradeFromAll();
saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL));
@ -479,6 +507,10 @@ public class AdminUpgradeAction extends FessAdminAction {
// nothing
}
private void upgradeFrom13_7() {
// nothing
}
private void upgradeFromAll() {
// nothing
}

1
src/main/webapp/WEB-INF/view/admin/upgrade/admin_upgrade.jsp
View file

@ -65,6 +65,7 @@
<la:option value="13.4">13.4</la:option>
<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:select>
</div>
</div>