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

fix #1906 update upgrade page

Browse source
This commit is contained in:
Shinsuke Sugaya 2018-11-18 13:38:41 +09:00
parent 0cb7fa51d6
commit 0b4688eda9
2 changed files with 22 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -53,6 +53,8 @@ public class AdminUpgradeAction extends FessAdminAction {
private static final String VERSION_12_2 = "12.2";
private static final String VERSION_12_3 = "12.3";
// ===================================================================================
// Attribute
//
@ -128,6 +130,7 @@ public class AdminUpgradeAction extends FessAdminAction {
upgradeFrom12_0();
upgradeFrom12_1();
upgradeFrom12_2();
upgradeFrom12_3();
upgradeFromAll();
saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL));
@ -141,6 +144,7 @@ public class AdminUpgradeAction extends FessAdminAction {
try {
upgradeFrom12_1();
upgradeFrom12_2();
upgradeFrom12_3();
upgradeFromAll();
saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL));
@ -153,6 +157,19 @@ public class AdminUpgradeAction extends FessAdminAction {
} else if (VERSION_12_2.equals(form.targetVersion)) {
try {
upgradeFrom12_2();
upgradeFrom12_3();
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_12_2, e.getLocalizedMessage()));
}
} else if (VERSION_12_3.equals(form.targetVersion)) {
try {
upgradeFrom12_3();
upgradeFromAll();
saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL));
@ -183,6 +200,10 @@ public class AdminUpgradeAction extends FessAdminAction {
}
private void upgradeFrom12_2() {
// nothing
}
private void upgradeFrom12_3() {
ComponentUtil.getThumbnailManager().migrate();
}

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

@ -47,6 +47,7 @@
<la:option value="12.0">12.0</la:option>
<la:option value="12.1">12.1</la:option>
<la:option value="12.2">12.2</la:option>
<la:option value="12.3">12.3</la:option>
</la:select>
</div>
</div>