NIHVIVO-3058 Merged r8848 and r8849 from maint-rel-vivo-1.3 branch.

webapp/web/templates/freemarker/body/individual/individual-menu.ftl

@@ -4,14 +4,15 @@
 
 <#include "individual-setup.ftl">
 
+<#assign hasElement = propertyGroups.pullProperty("${namespaces.display}hasElement")!>
+
+<#if hasElement?has_content>
     <script type="text/javascript">
         var menuItemData = [];
     </script>
     
     <h3>Menu management</h3>
     
-<#assign hasElement = propertyGroups.pullProperty("${namespaces.display}hasElement")!>
-
     <#-- List the menu items -->
     <ul class="menuItems">
         <#list hasElement.statements as statement>
@@ -43,3 +44,6 @@ ${headScripts.add('<script type="text/javascript" src="${urls.base}/js/jquery-ui
     </script>
     
     ${scripts.add('<script type="text/javascript" src="${urls.base}/js/individual/menuManagement.js"></script>')}
+<#else>
+    <p id="error-alert">There was an error in the system. The display:hasElement property could not be retrieved.</p>
+</#if>