Skip to content

Commit c6943c2

Browse files
Lukasz Plotnickidkayiwa
Lukasz Plotnicki
authored andcommittedDec 9, 2013
@lplotni/@jthoenes: TRUNK-4037 Retired location tags are being displayed with the class="retired" if they are selected on the location. If they are not selected, they will be not presented.
(cherry picked from commit 03eba15)
1 parent d2e5094 commit c6943c2

File tree

1 file changed

+6
-2
lines changed

1 file changed

+6
-2
lines changed
 

‎webapp/src/main/webapp/WEB-INF/view/admin/locations/locationForm.jsp

+6-2
Original file line numberDiff line numberDiff line change
@@ -89,8 +89,12 @@
8989
<spring:bind path="location.tags">
9090
<input type="hidden" name="_tags"/>
9191
<c:forEach var="t" items="${locationTags}">
92-
<input type="checkbox" name="tags" value="${t.id}" <c:if test="${openmrs:collectionContains(status.value, t)}">checked="true"</c:if>/>
93-
<openmrs:format locationTag="${t}"/>
92+
<c:if test="${openmrs:collectionContains(status.value, t) || !t.retired}">
93+
<span <c:if test="${t.retired}">class="retired"</c:if>>
94+
<input type="checkbox" name="tags" value="${t.id}" <c:if test="${openmrs:collectionContains(status.value, t)}">checked="true"</c:if>/>
95+
<openmrs:format locationTag="${t}"/>
96+
</span>
97+
</c:if>
9498
</c:forEach>
9599
<c:if test="${status.errorMessage != ''}"><span class="error">${status.errorMessage}</span></c:if>
96100
</spring:bind>

0 commit comments

Comments
 (0)
Please sign in to comment.