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

fix #2163 add 13.1

Browse source
This commit is contained in:
Shinsuke Sugaya 2019-07-04 17:06:41 +09:00
parent aed6b2bb47
commit eb7467e533
2 changed files with 31 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -57,8 +57,12 @@ public class AdminUpgradeAction extends FessAdminAction {
private static final String VERSION_12_6 = "12.6";
private static final String VERSION_12_7 = "12.7";
private static final String VERSION_13_0 = "13.0";
private static final String VERSION_13_1 = "13.1";
// ===================================================================================
// Attribute
//
@ -127,6 +131,7 @@ public class AdminUpgradeAction extends FessAdminAction {
upgradeFrom12_5();
upgradeFrom12_6();
upgradeFrom13_0();
upgradeFrom13_1();
upgradeFromAll();
saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL));
@ -145,6 +150,7 @@ public class AdminUpgradeAction extends FessAdminAction {
upgradeFrom12_5();
upgradeFrom12_6();
upgradeFrom13_0();
upgradeFrom13_1();
upgradeFromAll();
saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL));
@ -162,6 +168,7 @@ public class AdminUpgradeAction extends FessAdminAction {
upgradeFrom12_5();
upgradeFrom12_6();
upgradeFrom13_0();
upgradeFrom13_1();
upgradeFromAll();
saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL));
@ -178,6 +185,7 @@ public class AdminUpgradeAction extends FessAdminAction {
upgradeFrom12_5();
upgradeFrom12_6();
upgradeFrom13_0();
upgradeFrom13_1();
upgradeFromAll();
saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL));
@ -193,6 +201,7 @@ public class AdminUpgradeAction extends FessAdminAction {
upgradeFrom12_5();
upgradeFrom12_6();
upgradeFrom13_0();
upgradeFrom13_1();
upgradeFromAll();
saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL));
@ -207,6 +216,7 @@ public class AdminUpgradeAction extends FessAdminAction {
upgradeFrom12_5();
upgradeFrom12_6();
upgradeFrom13_0();
upgradeFrom13_1();
upgradeFromAll();
saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL));
@ -216,10 +226,11 @@ public class AdminUpgradeAction extends FessAdminAction {
logger.warn("Failed to upgrade data.", e);
saveError(messages -> messages.addErrorsFailedToUpgradeFrom(GLOBAL, VERSION_12_5, e.getLocalizedMessage()));
}
} else if (VERSION_12_6.equals(form.targetVersion)) {
} else if (VERSION_12_6.equals(form.targetVersion) || VERSION_12_7.equals(form.targetVersion)) {
try {
upgradeFrom12_6();
upgradeFrom13_0();
upgradeFrom13_1();
upgradeFromAll();
saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL));
@ -232,6 +243,19 @@ public class AdminUpgradeAction extends FessAdminAction {
} else if (VERSION_13_0.equals(form.targetVersion)) {
try {
upgradeFrom13_0();
upgradeFrom13_1();
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_1.equals(form.targetVersion)) {
try {
upgradeFrom13_1();
upgradeFromAll();
saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL));
@ -291,6 +315,10 @@ public class AdminUpgradeAction extends FessAdminAction {
// nothing
}
private void upgradeFrom13_1() {
// nothing
}
private void upgradeFromAll() {
// nothing
}

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

@ -51,7 +51,9 @@
<la:option value="12.4">12.4</la:option>
<la:option value="12.5">12.5</la:option>
<la:option value="12.6">12.6</la:option>
<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:select>
</div>
</div>