From a49cc4771eb66f1ac37f69bcf063e90ba3932700 Mon Sep 17 00:00:00 2001
From: mozzy11 <mozzymutesa@gmail.com>
Date: Fri, 4 Jan 2019 12:30:45 +0300
Subject: [PATCH] LUI-48: Un escaping the HTML for the retired answer concepts

cleaning spaces
---
 api/src/main/resources/messages.properties      | 2 +-
 omod/src/main/webapp/dictionary/concept.jsp     | 2 +-
 omod/src/main/webapp/dictionary/conceptForm.jsp | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/api/src/main/resources/messages.properties b/api/src/main/resources/messages.properties
index f8c23d3f..5398b3fa 100644
--- a/api/src/main/resources/messages.properties
+++ b/api/src/main/resources/messages.properties
@@ -9,4 +9,4 @@ legacyui.manageuser.noProviderIdentifier=No Identifier Specified
 
 ${project.parent.artifactId}.Location.purgeLocation=Permanently Delete Location
 ${project.parent.artifactId}.Location.confirmDelete=Are you sure you want to delete this Location? It will be permanently removed from the system.
-${project.parent.artifactId}.Location.purgedSuccessfully=Location deleted successfully
+${project.parent.artifactId}.Location.purgedSuccessfully=Location deleted successfully
\ No newline at end of file
diff --git a/omod/src/main/webapp/dictionary/concept.jsp b/omod/src/main/webapp/dictionary/concept.jsp
index 1444f3f2..2debc26b 100644
--- a/omod/src/main/webapp/dictionary/concept.jsp
+++ b/omod/src/main/webapp/dictionary/concept.jsp
@@ -227,7 +227,7 @@
                 <c:forEach items="${command.locales}" var="loc">
                     <td class="${loc}">
                         <c:forEach items="${command.conceptAnswersByLocale[loc]}" var="answer">
-                            <a href="concept.htm?conceptId=${fn:substring(answer.key, 0, fn:indexOf(answer.key, '^'))}"><c:out value="${answer.value}" /> (${fn:substring(answer.key, 0, fn:indexOf(answer.key, '^'))})</a><br/>
+                            <a href="concept.htm?conceptId=${fn:substring(answer.key, 0, fn:indexOf(answer.key, '^'))}"><c:out value="${answer.value}" escapeXml="false" /> (${fn:substring(answer.key, 0, fn:indexOf(answer.key, '^'))})</a><br/>
                         </c:forEach>
                     </td>
                 </c:forEach>
diff --git a/omod/src/main/webapp/dictionary/conceptForm.jsp b/omod/src/main/webapp/dictionary/conceptForm.jsp
index fe7835bd..4c715d35 100644
--- a/omod/src/main/webapp/dictionary/conceptForm.jsp
+++ b/omod/src/main/webapp/dictionary/conceptForm.jsp
@@ -498,7 +498,7 @@
 				<tr>
 					<td valign="top">
 						<select class="largeWidth" size="6" id="answerNames" multiple="multiple" onKeyUp="listKeyPress('answerNames', 'answerIds', ' ', event)">
-							<c:forEach items="${command.conceptAnswers}" var="answer">
+							<c:forEach items="${command.conceptAnswers}" var="answer" >
 								<option value="<c:out value="${answer.key}" />"><c:out value="${answer.value}" /> (${fn:substring(answer.key, 0, fn:indexOf(answer.key, '^'))})</option>
 							</c:forEach>
 						</select>