OpenMRS

Timestamp:

07/16/08 12:29:31 (6 months ago)

Author:

bwolfe

Message:

Merging trunk to the 1.3.x branch (sideporting) to get bug fixes into an RC5 release [4745]:[4946]

Files:

• openmrs/branches/1.3.x/web/WEB-INF/view/portlets/patientHeader.jsp (modified) (1 diff)

openmrs/branches/1.3.x/web/WEB-INF/view/portlets/patientHeader.jsp

@@ -141 +141 @@
-                                        <span id="patientHeaderRegimen">
-                                                <c:forEach items="${model.currentDrugOrders}" var="drugOrder" varStatus="drugOrderStatus">
-${drugOrder.drug.name}
+<c:if test="${!empty drugOrder.drug}">${drugOrder.drug.name}</c:if><c:if test="${empty drugOrder.drug}">${drugOrder.concept.name.name}</c:if>
-                                                        <c:if test="${!drugOrderStatus.last}">, </c:if>
-                                                </c:forEach>