VIVO-397

webapp/web/templates/freemarker/body/partials/individual/individual-property-group-menus.ftl

@@ -4,7 +4,6 @@
 
 <#import "lib-properties.ftl" as p>
 <#assign subjectUri = individual.controlPanelUrl()?split("=") >
-<#assign nameForOtherGroup = nameForOtherGroup!"other">
 
 <#if (propertyGroups.all)??>
     <#assign groups = propertyGroups.all>   
@@ -13,6 +12,7 @@
             <nav id="property-group-menu" role="navigation">
                 <ul role="list">
                     <#list groups as group>
+                      <#if (group.properties?size > 0) >
                         <#assign groupname = group.getName(nameForOtherGroup)>                        
                         <#if groupname?has_content>
                     		<#--create property group html id is the function that will replace all spaces with underscore to make a valid id-->
@@ -21,6 +21,7 @@
                             function to capitalize all except function words. -->
                             <li role="listitem"><a href="#${groupnameHtmlId}" title="${i18n().group_name}">${groupname?capitalize}</a></li>
                         </#if>
+                      </#if>
                     </#list>
                 </ul>
             </nav>
@@ -28,6 +29,7 @@
       </#if>
 </#if>
 <#list propertyGroups.all as group>
+  <#if (group.properties?size > 0)>
     <#assign groupName = group.getName(nameForOtherGroup)>
     <#assign verbose = (verbosePropertySwitch.currentValue)!false>
     
@@ -50,4 +52,5 @@
         <#-- List the properties in the group -->
         <#include "individual-properties.ftl">
     </section> <!-- end property-group -->
+  </#if>
 </#list>

webapp/web/templates/freemarker/body/partials/individual/individual-property-group-tabs.ftl

@@ -35,6 +35,7 @@
 </#if>
 </ul>
 <#list propertyGroups.all as group>
+    <#if (group.properties?size > 0)>
         <#assign groupName = group.getName(nameForOtherGroup)>
         <#assign groupNameHtmlId = p.createPropertyGroupHtmlId(groupName) >
         <#assign verbose = (verbosePropertySwitch.currentValue)!false>
@@ -59,6 +60,7 @@
         </div>
         </section> <!-- end property-group -->
         <#assign sectionCount = 2 >
+    </#if>
 </#list>
 <script>
     var individualLocalName = "${individual.localName}";