From 1085a57957ed144ed710ce92e89cc9d6488c53bc Mon Sep 17 00:00:00 2001
From: rjy7 <rjy7@440791e1-c2bf-4c1e-ad7c-caf3f8b0ebe8>
Date: Tue, 23 Mar 2010 18:43:59 +0000
Subject: [PATCH] NIHVIVO-142 Consolidated code to display data and object
 properties in entityBasic.jsp

---
 webapp/web/templates/entity/entityBasic.jsp | 24 ++++++---------------
 1 file changed, 6 insertions(+), 18 deletions(-)

diff --git a/webapp/web/templates/entity/entityBasic.jsp b/webapp/web/templates/entity/entityBasic.jsp
index cf2cb3ca3..a83c1b79b 100644
--- a/webapp/web/templates/entity/entityBasic.jsp
+++ b/webapp/web/templates/entity/entityBasic.jsp
@@ -266,24 +266,12 @@ RY Description not working - FIX
             </p:process>
             
             <%-- Properties --%>
-
-			<c:choose>
-			    <c:when test="${showEdits}">
-			         <c:import url="${entityMergedPropsListJsp}">
-			             <c:param name="mode" value="edit"/>
-			             <c:param name="grouped" value="false"/>
-			             <%-- unless a value is provided, properties not assigned to a group will not have a tab or appear on the page --%>
-			             <c:param name="unassignedPropsGroupName" value=""/>
-			         </c:import>
-			     </c:when>
-			     <c:otherwise>
-			         <c:import url="${entityMergedPropsListJsp}">
-			             <c:param name="grouped" value="false"/>
-			             <%-- unless a value is provided, properties not assigned to a group will not have a tab or appear on the page --%>
-			             <c:param name="unassignedPropsGroupName" value=""/>
-			         </c:import>
-			     </c:otherwise>
-			</c:choose>
+            <c:import url="${entityMergedPropsListJsp}">
+                <c:param name="mode" value="${showEdits ? 'edit' : ''}"/>
+                <c:param name="grouped" value="false"/>
+                <%-- unless a value is provided, properties not assigned to a group will not have a tab or appear on the page --%>
+                <c:param name="unassignedPropsGroupName" value=""/>
+            </c:import>
 
             <p:process>
                 <%-- Citation, if no thumbnail --%>