diff --git a/src/main/java/org/genesys2/server/servlet/controller/admin/ElasticSearchController.java b/src/main/java/org/genesys2/server/servlet/controller/admin/ElasticSearchController.java index 2404a899f96cd186e80b9c45557d598a49f95b3d..f0be1a0646a4538412ef871afd1e3fe69e7f38e6 100644 --- a/src/main/java/org/genesys2/server/servlet/controller/admin/ElasticSearchController.java +++ b/src/main/java/org/genesys2/server/servlet/controller/admin/ElasticSearchController.java @@ -42,7 +42,7 @@ import java.util.List; import java.util.Map; @Controller -@RequestMapping("/admin") +@RequestMapping("/admin/elastic") @PreAuthorize("hasRole('ADMINISTRATOR')") public class ElasticSearchController { public static final Log LOG = LogFactory.getLog(ElasticSearchController.class); @@ -64,7 +64,7 @@ public class ElasticSearchController { * @param model * @return */ - @RequestMapping("/elastic") + @RequestMapping("/") public String viewIndexesAndAliases(Model model) { ImmutableOpenMap indicesImmutableMap = client.admin().cluster() .prepareState().execute() @@ -90,10 +90,10 @@ public class ElasticSearchController { * * @return */ - @RequestMapping(method = RequestMethod.POST, value = "/elastic", params = { "regenerate" }) + @RequestMapping(method = RequestMethod.POST, value = "/action", params = { "regenerate" }) public String regenerateElastic() { elasticService.regenerateIndexes(); - return "redirect:/admin/"; + return "redirect:/admin/elastic/"; } /** @@ -103,12 +103,12 @@ public class ElasticSearchController { * @param jsonFilter * @throws IOException */ - @RequestMapping(method = RequestMethod.POST, value = "/elastic", params = { "reindex", "filter" }) + @RequestMapping(method = RequestMethod.POST, value = "/action", params = { "reindex", "filter" }) public String reindexElasticFiltered(@RequestParam(value = "filter", required = true) String jsonFilter) throws IOException { FilterHandler.AppliedFilters filters = mapper.readValue(jsonFilter, FilterHandler.AppliedFilters.class); elasticService.reindex(filters); - return "redirect:/admin/"; + return "redirect:/admin/elastic/"; } /** @@ -116,9 +116,9 @@ public class ElasticSearchController { * * @return */ - @RequestMapping(method = RequestMethod.POST, value = "/elastic", params = { "clear-queues" }) + @RequestMapping(method = RequestMethod.POST, value = "/action", params = { "clear-queues" }) public String clearElasticQueues() { elasticUpdater.clearQueues(); - return "redirect:/admin/"; + return "redirect:/admin/elastic/"; } } diff --git a/src/main/webapp/WEB-INF/jsp/admin/elastic/index.jsp b/src/main/webapp/WEB-INF/jsp/admin/elastic/index.jsp index d1a74463eca0e38d380055ea98eb4e0604da92d0..b04daf578a0cd5f931cb15cdb6096583b25016d5 100644 --- a/src/main/webapp/WEB-INF/jsp/admin/elastic/index.jsp +++ b/src/main/webapp/WEB-INF/jsp/admin/elastic/index.jsp @@ -9,9 +9,19 @@ <%@ include file="/WEB-INF/jsp/admin/menu.jsp"%> - " class="btn btn-default">Back +
"> + + + + + +
+
"> + + +
-

Indexes and their aliases

+

Indexes and their aliases

No indexes found.
 diff --git a/src/main/webapp/WEB-INF/jsp/admin/index.jsp b/src/main/webapp/WEB-INF/jsp/admin/index.jsp index e623d38f4716c28440b813a410dd85d31e151dd4..23bf4d5adb09965876891005082b8fab2db2517f 100644 --- a/src/main/webapp/WEB-INF/jsp/admin/index.jsp +++ b/src/main/webapp/WEB-INF/jsp/admin/index.jsp @@ -33,21 +33,6 @@ - -

Full-text Search

-
"> - - - - - -
-
"> - - -
- " class="btn btn-default">Show indexes and aliases -

Country data

"> diff --git a/src/main/webapp/WEB-INF/jsp/admin/menu.jsp b/src/main/webapp/WEB-INF/jsp/admin/menu.jsp index c469a8540f26666717d80e722ca24ed9ccedabcd..05409097ec57e23d6a1082671d7ffa8e3bf78b2a 100644 --- a/src/main/webapp/WEB-INF/jsp/admin/menu.jsp +++ b/src/main/webapp/WEB-INF/jsp/admin/menu.jsp @@ -6,5 +6,6 @@ > "> "> + " class="">Elasticsearch