aboutsummaryrefslogtreecommitdiff
path: root/models.py
diff options
context:
space:
mode:
authorAlban Gruin2017-11-25 14:22:03 +0100
committerAlban Gruin2017-11-25 14:22:03 +0100
commit621f5d7f0d28f7252e1ff0c0f1286824fa55c33e (patch)
treebc75bdb59ad82e960578b585af83c6f06882cdbe /models.py
parentd9e0cba8c24978150e66b9ccd7ea67aa50a5f22d (diff)
On ne compare plus les id des emplois du temps dans corresponds_to()
car dans le seul appel « utile », les arguments passés font forcément partie du même edt. Changement effectué pour des questions de performance. Correction des tests.
Diffstat (limited to 'models.py')
-rw-r--r--models.py11
1 files changed, 5 insertions, 6 deletions
diff --git a/models.py b/models.py
index bde27a7..59301e0 100644
--- a/models.py
+++ b/models.py
@@ -98,19 +98,18 @@ class Group(models.Model):
hidden = models.BooleanField(verbose_name="caché", default=False)
- def corresponds_to(self, timetable_id, mention, subgroup):
+ def corresponds_to(self, mention, subgroup):
subgroup_corresponds = True
if self.subgroup is not None and subgroup is not None:
subgroup_corresponds = self.subgroup.startswith(subgroup)
- return self.timetable.id == timetable_id and \
- (self.mention.startswith(mention) or \
- mention.startswith(self.mention)) and \
- subgroup_corresponds
+ return (self.mention.startswith(mention) or \
+ mention.startswith(self.mention)) and \
+ subgroup_corresponds
@property
def group_info(self):
- return self.timetable.id, self.mention, self.subgroup
+ return self.mention, self.subgroup
def __str__(self):
return self.name