Merge branch 'dev/alban'

1 files changed, 3 insertions, 3 deletions

diff --git a/models.py b/models.py
index c546737..3af1c06 100644
--- a/models.py
+++ b/models.py
@@ -71,7 +71,7 @@ class Timetable(SlugModel):
 
 class GroupManager(Manager):
     def get_parents(self, group):
-        groups_criteria = Q(subgroup__isnull=True) | \
+        groups_criteria = Q(subgroup__isnull=True) | Q(subgroup__startswith=group.subgroup) | \
                           reduce(lambda x, y: x | y,
                                  [Q(subgroup=group.subgroup[:i])
                                   for i in range(1, len(group.subgroup) + 1)])
@@ -80,13 +80,13 @@ class GroupManager(Manager):
                                           timetable=group.timetable)
 
     def get_relevant_groups(self, timetable, *args, **criteria):
-        sub = Group.objects.filter(timetable=timetable,mention=OuterRef("mention"),
+        sub = self.get_queryset().filter(timetable=timetable, mention=OuterRef("mention"),
                                    subgroup__startswith=OuterRef("subgroup")) \
                            .order_by().values("mention").annotate(c=Count("*")).values("c")
 
         return self.get_queryset().filter(*args, timetable=timetable, hidden=False, **criteria) \
                             .annotate(nbsub=Subquery(sub, output_field=models.IntegerField())) \
-                            .filter(nbsub=1).order_by("name")
+                            .filter(Q(nbsub=1) | Q(nbsub__isnull=True)).order_by("name")
 
 
 class Group(models.Model):