diff --git a/productMods/templates/freemarker/edit/forms/addGrantRoleToPerson.ftl b/productMods/templates/freemarker/edit/forms/addGrantRoleToPerson.ftl index 59d09f2c..20beb5b7 100644 --- a/productMods/templates/freemarker/edit/forms/addGrantRoleToPerson.ftl +++ b/productMods/templates/freemarker/edit/forms/addGrantRoleToPerson.ftl @@ -8,6 +8,10 @@ <#assign uriValues = editConfiguration.existingUriValues /> <#assign htmlForElements = editConfiguration.pageData.htmlForElements /> <#assign sparqlForAcFilter = editConfiguration.pageData.sparqlForAcFilter /> +<#--If edit submission exists, then retrieve validation errors if they exist--> +<#if editSubmission?has_content && editSubmission.submissionExists = true && editSubmission.validationErrors?has_content> + <#assign submissionErrors = editSubmission.validationErrors/> + <#assign disabledVal = ""/> <#if editMode = "edit"> <#assign disabledVal = "disabled=\"disabled\"" /> @@ -56,20 +60,40 @@

${formHeading} ${editConfiguration.subjectName}

-<#if errorNameFieldIsEmpty??> - <#assign errorMessage = "Enter a name for the grant." /> - - -<#if errorMessage?has_content> +<#--Display error messages if any--> +<#if submissionErrors?has_content>
-<@lvf.unsupportedBrowser/> +<@lvf.unsupportedBrowser urls.base />
@@ -80,19 +104,10 @@

<#if editMode = "edit"> - + -
-

- - - (Verify this match) -

- - <#--Field value populated by javascript above--> - -
+ <@lvf.acSelection urls.base />

Years of Participation in Grant

<#if htmlForElements?keys?seq_contains("startField")> @@ -139,4 +154,4 @@ ${scripts.add('')} ${scripts.add('')} ${scripts.add('')} - \ No newline at end of file +