diff --git a/stages/admin.py b/stages/admin.py
index 637a9ab..57c5169 100644
--- a/stages/admin.py
+++ b/stages/admin.py
@@ -123,7 +123,7 @@ class ExaminationInline(admin.StackedInline):
'
Veuillez compléter les informations '
'd’examen (date/salle/experts) pour accéder aux boutons d’impression.
'
)
- if obj and obj.student.is_ede_3():
+ if obj and obj.student.is_ede():
if obj.missing_examination_data():
return missing_message
else:
@@ -137,7 +137,7 @@ class ExaminationInline(admin.StackedInline):
reverse('print-compens-form', args=[obj.pk, 'ep']),
reverse('print-compens-form', args=[obj.pk, 'sout']),
)
- elif obj and obj.student.is_eds_3():
+ elif obj and obj.student.is_eds():
if obj.missing_examination_data():
return missing_message
else:
@@ -204,12 +204,12 @@ class StudentAdmin(admin.ModelAdmin):
# SupervisionBillInline is only adequate for EDE students
if not obj.klass or obj.klass.section.name != 'EDE':
inlines = [inl for inl in inlines if inl != SupervisionBillInline]
- if not obj.is_ede_3() and not obj.is_eds_3():
+ if not obj.is_ede() and not obj.is_eds():
inlines = [inl for inl in inlines if inl != ExaminationInline]
return inlines
def get_fieldsets(self, request, obj=None):
- if not obj or (not obj.is_ede_3() and not obj.is_eds_3()):
+ if not obj or (not obj.is_ede() and not obj.is_eds()):
# Hide group "Procédure de qualification"
fieldsets = deepcopy(self.fieldsets)
fieldsets[1][1]['classes'] = ['hidden']
diff --git a/stages/models.py b/stages/models.py
index 68f67d0..9eef11f 100644
--- a/stages/models.py
+++ b/stages/models.py
@@ -376,11 +376,11 @@ class Student(models.Model):
return user.has_perm('stages.change_student') or user.teacher == self.klass.teacher
return False
- def is_ede_3(self):
- return self.klass and self.klass.section.name == 'EDE' and self.klass.level.name == '3'
+ def is_ede(self):
+ return self.klass and self.klass.section.name == 'EDE'
- def is_eds_3(self):
- return self.klass and self.klass.section.name == 'EDS' and self.klass.level.name == '3'
+ def is_eds(self):
+ return self.klass and self.klass.section.name == 'EDS'
class Examination(models.Model):