diff --git a/src/main/java/jp/sf/fess/action/admin/DocumentAction.java b/src/main/java/jp/sf/fess/action/admin/DocumentAction.java index da276ed48..3ac28780d 100644 --- a/src/main/java/jp/sf/fess/action/admin/DocumentAction.java +++ b/src/main/java/jp/sf/fess/action/admin/DocumentAction.java @@ -325,17 +325,17 @@ public class DocumentAction implements Serializable { public List> getGroupActionItems() { final List> groupActionItems = new ArrayList>(); - try { - for (final String groupName : solrGroupManager.getSolrGroupNames()) { + for (final String groupName : solrGroupManager.getSolrGroupNames()) { + try { final Map map = new HashMap(); map.put("groupName", groupName); final SessionIdList> sessionIdList = getSessionIdList(groupName); map.put("sessionIdItems", sessionIdList); map.put("totalCount", sessionIdList.getTotalCount()); groupActionItems.add(map); + } catch (final Exception e) { + logger.info("could not get server groups.", e); } - } catch (final Exception e) { - logger.info("could not get server groups.", e); } return groupActionItems; } diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties index 5e66e44b7..fe843d26a 100644 --- a/src/main/resources/application.properties +++ b/src/main/resources/application.properties @@ -743,6 +743,7 @@ labels.system_server_status=Server Status labels.system_index_status=Index Status labels.crawler_status_title=Crawler Status labels.crawler_sessionid_all=All +labels.no_available_solr_servers=No available Solr server. # view/admin/crawlingSession/confirm.jsp #labels.path_mapping_configuration= diff --git a/src/main/resources/application_ja.properties b/src/main/resources/application_ja.properties index 5b1f7a0d5..4d415a806 100644 --- a/src/main/resources/application_ja.properties +++ b/src/main/resources/application_ja.properties @@ -741,6 +741,7 @@ labels.system_server_status=\u30b5\u30fc\u30d0\u30fc\u72b6\u614b labels.system_index_status=\u30a4\u30f3\u30c7\u30c3\u30af\u30b9\u72b6\u614b labels.crawler_status_title=\u30af\u30ed\u30fc\u30e9\u30fc\u72b6\u614b labels.crawler_sessionid_all=\u3059\u3079\u3066 +labels.no_available_solr_servers=\u5229\u7528\u53ef\u80fd\u306aSolr\u30b5\u30fc\u30d0\u304c\u3042\u308a\u307e\u305b\u3093\u3002 # view/admin/crawlingSession/confirm.jsp #labels.path_mapping_configuration= diff --git a/src/main/webapp/WEB-INF/view/admin/document/index.jsp b/src/main/webapp/WEB-INF/view/admin/document/index.jsp index e23c8990e..6098eb002 100644 --- a/src/main/webapp/WEB-INF/view/admin/document/index.jsp +++ b/src/main/webapp/WEB-INF/view/admin/document/index.jsp @@ -20,6 +20,10 @@ <%-- Message: END --%> + +
+
+

@@ -137,6 +141,7 @@

+