From 9890e86277b818a05169907f4e876954835a1ba0 Mon Sep 17 00:00:00 2001
From: tworrall <tworrall@43c2fc9b-1942-4403-87b2-35b4218f7473>
Date: Thu, 21 Jun 2012 21:20:06 +0000
Subject: [PATCH] NIHVIVO-3805 adRoleToPersonTwoStage template was missing an
 assign statement that is necessary when there are validation errors

---
 .../freemarker/edit/forms/addRoleToPersonTwoStage.ftl        | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/productMods/templates/freemarker/edit/forms/addRoleToPersonTwoStage.ftl b/productMods/templates/freemarker/edit/forms/addRoleToPersonTwoStage.ftl
index 7d1adff7..78e017a2 100644
--- a/productMods/templates/freemarker/edit/forms/addRoleToPersonTwoStage.ftl
+++ b/productMods/templates/freemarker/edit/forms/addRoleToPersonTwoStage.ftl
@@ -80,6 +80,9 @@ Set this flag on the input acUriReceiver where you would like this behavior to o
 <h2>${titleVerb}&nbsp;${roleDescriptor} entry for ${editConfiguration.subjectName}</h2>
 
 <#--Display error messages if any-->
+<#if activityLabelDisplayValue?has_content >
+    <#assign activityLabelValue = activityLabelDisplayValue />
+</#if>
 
 
 <#if submissionErrors?has_content>
@@ -154,7 +157,7 @@ Set this flag on the input acUriReceiver where you would like this behavior to o
             <p>
                 <label for="activity">### Name ${requiredHint}</label>
                 <input class="acSelector" size="50"  type="text" id="activity" name="activityLabel"  acGroupName="activity" value="${activityLabelValue}" />
-                <input class="display" type="hidden" id="activityDisplay" acGroupName="activity" name="activityLabelDisplay" value="$activityLabelDisplayValue}">
+                <input class="display" type="hidden" id="activityDisplay" acGroupName="activity" name="activityLabelDisplay" value="${activityLabelDisplayValue}">
             </p>
             
             <input type="hidden" id="roleToActivityPredicate" name="roleToActivityPredicate" value="" />