From 9ef66e87643b897c71e6a335c7a78a4582cac0d2 Mon Sep 17 00:00:00 2001
From: Tim Worrall <tlw72@cornell.edu>
Date: Fri, 6 Jun 2014 16:22:18 -0400
Subject: [PATCH] VIVO-694: resolved null pointer exception with web pages

---
 .../templates/freemarker/edit/forms/addEditWebpageForm.ftl      | 2 ++
 .../freemarker/edit/forms/manageWebpagesForIndividual.ftl       | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/productMods/templates/freemarker/edit/forms/addEditWebpageForm.ftl b/productMods/templates/freemarker/edit/forms/addEditWebpageForm.ftl
index 8b9810d7..8fd73c2b 100644
--- a/productMods/templates/freemarker/edit/forms/addEditWebpageForm.ftl
+++ b/productMods/templates/freemarker/edit/forms/addEditWebpageForm.ftl
@@ -48,6 +48,8 @@
 </#if>    
     
 <form class="customForm" action ="${submitUrl}">
+	<input type="hidden" name="rangeUri" value="${editConfiguration.rangeUri!}">
+	<input type="hidden" name="domainUri" value="${editConfiguration.domainUri!}">
 
     <label for="urlType">${i18n().url_type}${requiredHint}</label>
     <#assign urlTypeOpts = editConfiguration.pageData.urlType />
diff --git a/productMods/templates/freemarker/edit/forms/manageWebpagesForIndividual.ftl b/productMods/templates/freemarker/edit/forms/manageWebpagesForIndividual.ftl
index c4288518..6e1c81fd 100644
--- a/productMods/templates/freemarker/edit/forms/manageWebpagesForIndividual.ftl
+++ b/productMods/templates/freemarker/edit/forms/manageWebpagesForIndividual.ftl
@@ -40,7 +40,7 @@
                 <#if webpage.typeLabel??>(<#if webpage.typeLabel == "URL">Standard Web Link<#else>${webpage.typeLabel}</#if></#if>)
             </span>
             <span class="editingLinks">
-                <a href="${baseEditWebpageUrl}&objectUri=${webpage.vcard}&predicateUri=${predicateUri}&linkUri=${webpage.link}" class="edit" title="${i18n().edit_webpage_link}">${i18n().edit_capitalized}</a> | 
+                <a href="${baseEditWebpageUrl}&objectUri=${webpage.vcard}&predicateUri=${predicateUri}&linkUri=${webpage.link}&rangeUri=${editConfiguration.rangeUri?url}&domainUri=${editConfiguration.domainUri?url}" class="edit" title="${i18n().edit_webpage_link}">${i18n().edit_capitalized}</a> | 
                 <a href="${urls.base}${deleteWebpageUrl}" class="remove" title="${i18n().delete_webpage_link}">${i18n().delete_button}</a> 
             </span>
         </li>