From 1fa51931bfdb31b6ad8a7c41b74421f4bfd00981 Mon Sep 17 00:00:00 2001
From: Alex Bogdanovski <alex@erudika.com>
Date: Mon, 28 Mar 2022 19:58:04 +0300
Subject: [PATCH] fixed search filter for answered questions

---
 .../com/erudika/scoold/controllers/QuestionsController.java  | 5 +++++
 src/main/resources/templates/macro.vm                        | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/main/java/com/erudika/scoold/controllers/QuestionsController.java b/src/main/java/com/erudika/scoold/controllers/QuestionsController.java
index 994b0203..5eb044fe 100755
--- a/src/main/java/com/erudika/scoold/controllers/QuestionsController.java
+++ b/src/main/java/com/erudika/scoold/controllers/QuestionsController.java
@@ -349,6 +349,11 @@ private String getQuestionsQuery(HttpServletRequest req, Profile authUser, Strin
 			p.setSortby("properties.lastactivity");
 		} else if ("votes".equals(sortby)) {
 			p.setSortby("votes");
+		} else if ("answered".equals(sortby)) {
+			p.setSortby("timestamp");
+			String q = "properties.answerid:[* TO *]";
+			query = utils.getSpaceFilteredQuery(req, spaceFiltered,
+					utils.getSpaceFilter(authUser, currentSpace) + " AND " + q, q);
 		} else if ("unanswered".equals(sortby)) {
 			p.setSortby("timestamp");
 			if ("default_pager".equals(p.getName()) && p.isDesc()) {
diff --git a/src/main/resources/templates/macro.vm b/src/main/resources/templates/macro.vm
index fb6385c2..d1d0fc73 100755
--- a/src/main/resources/templates/macro.vm
+++ b/src/main/resources/templates/macro.vm
@@ -199,7 +199,7 @@
 #macro(tagsbox $post $link)
 	#set($tags = $post.tags)
 	#if($post.answerid)
-	<a href="$questionslink?sortby=properties.answerid" title="Posts with approved answer" class="chip mrs light-green white-text">
+	<a href="$questionslink?sortby=answered" title="Posts with approved answer" class="chip mrs light-green white-text">
 		<i class="fa fa-check-circle"></i> $!lang.get('posts.answered')
 	</a>
 	#end