Merge pull request #669 from hms-dbmi/HYP-302

HYP 302

Author: b32147

app/projects/models.py

@@ -703,6 +703,8 @@ class Group(models.Model):
     def __str__(self):
         return self.title
 
+    def active_project_child_groups(self):
+        return self.group_set.filter(dataproject__isnull=False, dataproject__visible=True).distinct()
 
 ################################################################################
 # Deprecated models

app/templates/base.html

@@ -214,7 +214,7 @@
                         <li class="dropdown">
                           <a class="dropdown-toggle" data-toggle="dropdown" href="#">{{ group.navigation_title|default:group.title }} <span class="caret"></span></a>
                           <ul class="dropdown-menu" aria-labelledby="{{ group.navigation_title|default:group.title }}">
-                            {% for child in group.group_set.all %}
+                            {% for child in group.active_project_child_groups %}
                             {% url 'group' child.key as group_url %}
                             <li class="nav-item{% if request.path == group_url or child.key == navigation.active_group.key %} active{% endif %}"><a class="nav-link" href="{{ group_url }}">{{ child.navigation_title|default:child.title }}</a></li>
                             {% endfor %}