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

fix #2207 update upgrade page

Browse source
This commit is contained in:
Shinsuke Sugaya 2019-08-16 05:58:01 +09:00
parent 6bebe4f91d
commit e252247134
2 changed files with 28 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -63,6 +63,8 @@ public class AdminUpgradeAction extends FessAdminAction {
private static final String VERSION_13_1 = "13.1";
private static final String VERSION_13_2 = "13.2";
// ===================================================================================
// Attribute
//
@ -132,6 +134,7 @@ public class AdminUpgradeAction extends FessAdminAction {
upgradeFrom12_6();
upgradeFrom13_0();
upgradeFrom13_1();
upgradeFrom13_2();
upgradeFromAll();
saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL));
@ -151,6 +154,7 @@ public class AdminUpgradeAction extends FessAdminAction {
upgradeFrom12_6();
upgradeFrom13_0();
upgradeFrom13_1();
upgradeFrom13_2();
upgradeFromAll();
saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL));
@ -169,6 +173,7 @@ public class AdminUpgradeAction extends FessAdminAction {
upgradeFrom12_6();
upgradeFrom13_0();
upgradeFrom13_1();
upgradeFrom13_2();
upgradeFromAll();
saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL));
@ -186,6 +191,7 @@ public class AdminUpgradeAction extends FessAdminAction {
upgradeFrom12_6();
upgradeFrom13_0();
upgradeFrom13_1();
upgradeFrom13_2();
upgradeFromAll();
saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL));
@ -202,6 +208,7 @@ public class AdminUpgradeAction extends FessAdminAction {
upgradeFrom12_6();
upgradeFrom13_0();
upgradeFrom13_1();
upgradeFrom13_2();
upgradeFromAll();
saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL));
@ -217,6 +224,7 @@ public class AdminUpgradeAction extends FessAdminAction {
upgradeFrom12_6();
upgradeFrom13_0();
upgradeFrom13_1();
upgradeFrom13_2();
upgradeFromAll();
saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL));
@ -231,6 +239,7 @@ public class AdminUpgradeAction extends FessAdminAction {
upgradeFrom12_6();
upgradeFrom13_0();
upgradeFrom13_1();
upgradeFrom13_2();
upgradeFromAll();
saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL));
@ -244,6 +253,7 @@ public class AdminUpgradeAction extends FessAdminAction {
try {
upgradeFrom13_0();
upgradeFrom13_1();
upgradeFrom13_2();
upgradeFromAll();
saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL));
@ -256,6 +266,19 @@ public class AdminUpgradeAction extends FessAdminAction {
} else if (VERSION_13_1.equals(form.targetVersion)) {
try {
upgradeFrom13_1();
upgradeFrom13_2();
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_0, e.getLocalizedMessage()));
}
} else if (VERSION_13_2.equals(form.targetVersion)) {
try {
upgradeFrom13_2();
upgradeFromAll();
saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL));
@ -319,6 +342,10 @@ public class AdminUpgradeAction extends FessAdminAction {
// nothing
}
private void upgradeFrom13_2() {
// nothing
}
private void upgradeFromAll() {
// nothing
}

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

@ -54,6 +54,7 @@
<la:option value="12.7">12.7</la:option>
<la:option value="13.0">13.0</la:option>
<la:option value="13.1">13.1</la:option>
<la:option value="13.2">13.2</la:option>
</la:select>
</div>
</div>