diff --git a/src/main/java/org/codelibs/fess/app/web/admin/plugin/AdminPluginAction.java b/src/main/java/org/codelibs/fess/app/web/admin/plugin/AdminPluginAction.java index 2fb1720bd..6163a79d3 100644 --- a/src/main/java/org/codelibs/fess/app/web/admin/plugin/AdminPluginAction.java +++ b/src/main/java/org/codelibs/fess/app/web/admin/plugin/AdminPluginAction.java @@ -119,9 +119,16 @@ public class AdminPluginAction extends FessAdminAction { @Execute public HtmlResponse installplugin() { saveToken(); - return asHtml(path_AdminPlugin_AdminPluginInstallpluginJsp).renderWith( - data -> RenderDataUtil.register(data, "availableArtifactItems", getAllAvailableArtifacts())).useForm(InstallForm.class, - op -> op.setup(form -> {})); + return asHtml(path_AdminPlugin_AdminPluginInstallpluginJsp).renderWith(data -> { + final List> result = new ArrayList<>(); + final Map map = new HashMap<>(); + map.put("id", UPLOAD); + map.put("name", ""); + map.put("version", ""); + result.add(map); + result.addAll(getAllAvailableArtifacts()); + RenderDataUtil.register(data, "availableArtifactItems", result); + }).useForm(InstallForm.class, op -> op.setup(form -> {})); } private HtmlResponse asListHtml() { @@ -132,11 +139,6 @@ public class AdminPluginAction extends FessAdminAction { public static List> getAllAvailableArtifacts() { final PluginHelper pluginHelper = ComponentUtil.getPluginHelper(); final List> result = new ArrayList<>(); - final Map map = new HashMap<>(); - map.put("id", UPLOAD); - map.put("name", ""); - map.put("version", ""); - result.add(map); for (final PluginHelper.ArtifactType artifactType : PluginHelper.ArtifactType.values()) { result.addAll(Arrays.stream(pluginHelper.getAvailableArtifacts(artifactType)).map(AdminPluginAction::beanToMap) .collect(Collectors.toList())); diff --git a/src/main/webapp/WEB-INF/view/admin/plugin/admin_plugin_installplugin.jsp b/src/main/webapp/WEB-INF/view/admin/plugin/admin_plugin_installplugin.jsp index 1c291b90e..ac835c42e 100644 --- a/src/main/webapp/WEB-INF/view/admin/plugin/admin_plugin_installplugin.jsp +++ b/src/main/webapp/WEB-INF/view/admin/plugin/admin_plugin_installplugin.jsp @@ -60,7 +60,7 @@
- +