Bug fixes on history page. Default to viewType "All". Support capital OK

tcplugins · Aug 4, 2020 · 99409d2 · 99409d2
1 parent 0c53b6b
commit 99409d2
Showing 1 changed file with 5 additions and 2 deletions.
diff --git a/tcwebhooks-web-ui/src/main/java/webhook/teamcity/history/WebHookHistoryController.java b/tcwebhooks-web-ui/src/main/java/webhook/teamcity/history/WebHookHistoryController.java
@@ -52,13 +52,15 @@ protected ModelAndView doHandle(HttpServletRequest request, HttpServletResponse
     	params.put("okCount", myWebHookHistoryRepository.getOkCount());
     	params.put("skippedCount", myWebHookHistoryRepository.getDisabledCount());
     	params.put("totalCount", myWebHookHistoryRepository.getTotalCount());
+
+    	String viewType = request.getParameter(PARAM_NAME_VIEW) != null ? request.getParameter(PARAM_NAME_VIEW) : "All";
 
-		if (isGet(request) && request.getParameter(PARAM_NAME_VIEW) != null) {
+		if (isGet(request)) {
 			int pageNumber = getPageNumber(request);
 			int pageSize = getPageSize(request);
 			params.put("page", pageNumber);
 			PagedList<WebHookHistoryItem> pagedList;
-			switch ( request.getParameter(PARAM_NAME_VIEW)) {
+			switch ( viewType ) {
 				case "errors":
 				case "Errors":
 					pagedList = myWebHookHistoryRepository.findHistoryErroredItems(pageNumber, pageSize);
@@ -71,6 +73,7 @@ protected ModelAndView doHandle(HttpServletRequest request, HttpServletResponse
 					break;
 				case "ok":
 				case "Ok":
+				case "OK":
 					pagedList = myWebHookHistoryRepository.findHistoryOkItems(pageNumber, pageSize);
 					params.put(PARAM_NAME_COUNT_CONTEXT, "OK");
 					break;