From ffffa1cef4e0c2f1e617dc74a57c5045325e57aa Mon Sep 17 00:00:00 2001
From: Alban Gruin
Date: Fri, 24 Nov 2017 19:28:35 +0100
Subject: Correction d’un bogue qui empêchait l’affichage des groupes si deux
 groupes ont le même nom mais pas le même semestre.

---
 models.py | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

(limited to 'models.py')

diff --git a/models.py b/models.py
index 6d06793..4c3f3c3 100644
--- a/models.py
+++ b/models.py
@@ -83,9 +83,10 @@ class GroupManager(Manager):
                                           timetable=group.timetable)
 
     def get_relevant_groups(self, timetable, *args, **criteria):
-        sub = self.get_queryset().filter(timetable=timetable, mention=OuterRef("mention"),
-                                   subgroup__startswith=OuterRef("subgroup")) \
-                           .order_by().values("mention").annotate(c=Count("*")).values("c")
+        sub = self.get_queryset().filter(timetable=timetable,
+                                         mention__startswith=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())) \
-- 
cgit v1.2.1


From b28630da06a6c1286d5cd34d6437d8dd19d6f298 Mon Sep 17 00:00:00 2001
From: Alban Gruin
Date: Fri, 24 Nov 2017 20:02:21 +0100
Subject: Ajout de nouveaux tests pour ces nouveaux cas

---
 models.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'models.py')

diff --git a/models.py b/models.py
index 4c3f3c3..14270cf 100644
--- a/models.py
+++ b/models.py
@@ -116,7 +116,8 @@ class Group(models.Model):
                                    self.subgroup.startswith(subgroup)
 
         return self.timetable.id == timetable_id and \
-            self.mention.startswith(mention) and \
+            (self.mention.startswith(mention) or \
+             mention.startswith(self.mention)) and \
             subgroup_corresponds
 
     @property
-- 
cgit v1.2.1