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

fix #2138 update admin upgrade page

Browse source
This commit is contained in:
Shinsuke Sugaya 2019-05-30 22:50:23 +09:00
parent fcb3f6c191
commit fcde890db5
2 changed files with 26 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -57,6 +57,8 @@ public class AdminUpgradeAction extends FessAdminAction {
private static final String VERSION_12_6 = "12.6";
private static final String VERSION_13_0 = "13.0";
// ===================================================================================
// Attribute
//
@ -124,6 +126,7 @@ public class AdminUpgradeAction extends FessAdminAction {
upgradeFrom12_4();
upgradeFrom12_5();
upgradeFrom12_6();
upgradeFrom13_0();
upgradeFromAll();
saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL));
@ -141,6 +144,7 @@ public class AdminUpgradeAction extends FessAdminAction {
upgradeFrom12_4();
upgradeFrom12_5();
upgradeFrom12_6();
upgradeFrom13_0();
upgradeFromAll();
saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL));
@ -157,6 +161,7 @@ public class AdminUpgradeAction extends FessAdminAction {
upgradeFrom12_4();
upgradeFrom12_5();
upgradeFrom12_6();
upgradeFrom13_0();
upgradeFromAll();
saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL));
@ -172,6 +177,7 @@ public class AdminUpgradeAction extends FessAdminAction {
upgradeFrom12_4();
upgradeFrom12_5();
upgradeFrom12_6();
upgradeFrom13_0();
upgradeFromAll();
saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL));
@ -186,6 +192,7 @@ public class AdminUpgradeAction extends FessAdminAction {
upgradeFrom12_4();
upgradeFrom12_5();
upgradeFrom12_6();
upgradeFrom13_0();
upgradeFromAll();
saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL));
@ -199,6 +206,7 @@ public class AdminUpgradeAction extends FessAdminAction {
try {
upgradeFrom12_5();
upgradeFrom12_6();
upgradeFrom13_0();
upgradeFromAll();
saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL));
@ -211,6 +219,7 @@ public class AdminUpgradeAction extends FessAdminAction {
} else if (VERSION_12_6.equals(form.targetVersion)) {
try {
upgradeFrom12_6();
upgradeFrom13_0();
upgradeFromAll();
saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL));
@ -220,6 +229,18 @@ public class AdminUpgradeAction extends FessAdminAction {
logger.warn("Failed to upgrade data.", e);
saveError(messages -> messages.addErrorsFailedToUpgradeFrom(GLOBAL, VERSION_12_6, e.getLocalizedMessage()));
}
} else if (VERSION_13_0.equals(form.targetVersion)) {
try {
upgradeFrom13_0();
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 {
saveError(messages -> messages.addErrorsUnknownVersionForUpgrade(GLOBAL));
}
@ -266,6 +287,10 @@ public class AdminUpgradeAction extends FessAdminAction {
"{\"properties\":{\"hitCountRelation\":{\"type\":\"keyword\"}}}");
}
private void upgradeFrom13_0() {
// nothing
}
private void upgradeFromAll() {
// nothing
}

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

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