diff --git a/jdav_web/members/admin.py b/jdav_web/members/admin.py index de8128f..31de6a6 100644 --- a/jdav_web/members/admin.py +++ b/jdav_web/members/admin.py @@ -112,8 +112,7 @@ class EmergencyContactInline(CommonAdminInlineMixin, admin.TabularInline): formfield_overrides = { TextField: {'widget': Textarea(attrs={'rows': 1, 'cols': 40})} } - fields = ['prename', 'lastname', 'email', 'phone_number', 'confirmed_mail'] - readonly_fields = ['confirmed_mail'] + fields = ['prename', 'lastname', 'email', 'phone_number'] extra = 0 diff --git a/jdav_web/members/models.py b/jdav_web/members/models.py index ebe3f47..d15664f 100644 --- a/jdav_web/members/models.py +++ b/jdav_web/members/models.py @@ -445,11 +445,6 @@ class Member(Person): return not self.confirmed and self.confirmed_alternative_mail and self.confirmed_mail and\ all([emc.confirmed_mail for emc in self.emergencycontact_set.all()]) - def request_mail_confirmation(self, rerequest=False): - ret = super().request_mail_confirmation(rerequest) - rets = [emc.request_mail_confirmation(rerequest) for emc in self.emergencycontact_set.all()] - return ret or any(rets) - def confirm_mail(self, key): ret = super().confirm_mail(key) if self.registration_ready():