Merge branch 'development' into 'master'

Deploy request history and request filter fix

See merge request !650

src/main/java/nl/tudelft/queue/controller/RequestController.java

@@ -137,6 +137,8 @@ public class RequestController {
 	public String getRequestTableView(Model model,
 			@AuthenticatedPerson Person assistant,
 			@PageableDefault(sort = "createdAt", direction = Sort.Direction.DESC, size = 25) Pageable pageable) {
+		model.addAttribute("showName", false);
+		model.addAttribute("showOnlyRelevant", true);
 		setRequestTableAttributes(model, pageable, assistant,
 				"/requests", r -> r.getEventInfo().getStatus().isPending(), false, true);
 		return "request/list";
@@ -155,6 +157,8 @@ public class RequestController {
 	public String getRequestTableHistoryView(Model model,
 			@AuthenticatedPerson Person assistant,
 			@PageableDefault(sort = "createdAt", direction = Sort.Direction.DESC, size = 25) Pageable pageable) {
+		model.addAttribute("showName", true);
+		model.addAttribute("showOnlyRelevant", false);
 		setRequestTableAttributes(model, pageable, assistant,
 				"/requests/history", r -> !r.getEventInfo().getStatus().isPending(), true, false);
 		return "request/list";

src/main/resources/templates/request/list.html

@@ -101,7 +101,7 @@
     </div>
 
     <div class="row col-12">
-        <th:block th:replace="request/list/request-table :: request-table(showName=${false}, showOnlyRelevant=${true})">
+        <th:block th:replace="request/list/request-table :: request-table(showName=${showName}, showOnlyRelevant=${showOnlyRelevant})">
         </th:block>
     </div>