From ea98c150929e139ba9d6deb8b8eb6661a01b69bf Mon Sep 17 00:00:00 2001
From: Tim Worrall <tlw72@cornell.edu>
Date: Wed, 22 Oct 2014 15:18:14 -0400
Subject: [PATCH] VIVO-217: modified template to handle situations where the
 associatedPage variable is null

---
 webapp/web/templates/freemarker/edit/forms/menuManagement.ftl | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/webapp/web/templates/freemarker/edit/forms/menuManagement.ftl b/webapp/web/templates/freemarker/edit/forms/menuManagement.ftl
index 54e9c6196..b4c960ffa 100644
--- a/webapp/web/templates/freemarker/edit/forms/menuManagement.ftl
+++ b/webapp/web/templates/freemarker/edit/forms/menuManagement.ftl
@@ -45,7 +45,7 @@
         <section id="existingContentType" name="existingContentType" ${existingClassGroupStyle} role="region">
             <p>${i18n().selected_page_content_type}</p>
             <p>
-                <span id="selectedContentTypeValue" name="selectedContentTypeValue">${associatedPage}</span>
+                <span id="selectedContentTypeValue" name="selectedContentTypeValue">${associatedPage!}</span>
                 <a href="#" id="changeContentType" name="changeContentType" title="${i18n().change_content_type}">${i18n().change_content_type}</a>
             </p>
         </section>
@@ -57,7 +57,7 @@
            <select name="selectClassGroup" id="selectClassGroup" role="combobox">
                <option value="-1" role="option">${i18n().select_one}</option>
                <#list classGroups as aClassGroup>
-                    <option value="${aClassGroup.URI}" <#if aClassGroup.URI = associatedPageURI>selected</#if> role="option">${aClassGroup.publicName}</option>
+                    <option value="${aClassGroup.URI}" <#if aClassGroup.URI = associatedPageURI!"">selected</#if> role="option">${aClassGroup.publicName}</option>
                </#list>
            </select>
         </section>