From 8dfbca46c2d762c42d82e52655dc1065bdee93d6 Mon Sep 17 00:00:00 2001 From: Antoine Nguyen Date: Wed, 23 Nov 2016 14:18:39 +0100 Subject: [PATCH] Remove deprecated signals. --- modoboa/admin/forms/account.py | 12 ------------ modoboa/core/signals.py | 4 ---- 2 files changed, 16 deletions(-) diff --git a/modoboa/admin/forms/account.py b/modoboa/admin/forms/account.py index 417a293ed..03c91ecc0 100644 --- a/modoboa/admin/forms/account.py +++ b/modoboa/admin/forms/account.py @@ -228,15 +228,6 @@ class AccountFormMail(forms.Form, DynamicForm): self.field_widths = { "quota": 3 } - self.extra_fields = [] - results = core_signals.extra_form_fields.send( - sender=self.__class__, form="mailform", instance=self.mb) - if results: - results = reduce( - lambda a, b: a + b, [result for result in results]) - for fname, field in results: - self.fields[fname] = field - self.extra_fields.append(fname) if self.mb is not None: self.fields["email"].required = True qset = self.mb.aliasrecipient_set.filter(alias__internal=False) @@ -384,9 +375,6 @@ class AccountFormMail(forms.Form, DynamicForm): self.cleaned_data["use_domain_quota"] = ( self.cleaned_data["quota_act"]) self.mb.update_from_dict(user, self.cleaned_data) - core_signals.extra_form_fields.send( - sender=self.__class__, form="mailform", instance=self.mb, - cleaned_data=self.cleaned_data) account.email = self.cleaned_data["email"] account.save() diff --git a/modoboa/core/signals.py b/modoboa/core/signals.py index 0a215c8a1..6bce716f5 100644 --- a/modoboa/core/signals.py +++ b/modoboa/core/signals.py @@ -17,8 +17,6 @@ can_create_object = django.dispatch.Signal( extra_account_actions = django.dispatch.Signal(providing_args=["account"]) extra_admin_menu_entries = django.dispatch.Signal( providing_args=["location", "user"]) -extra_form_fields = django.dispatch.Signal( - providing_args=["form", "instance"]) extra_role_permissions = django.dispatch.Signal(providing_args=["role"]) extra_static_content = django.dispatch.Signal( providing_args=["caller", "st_type", "user"]) @@ -30,8 +28,6 @@ get_top_notifications = django.dispatch.Signal( providing_args=["include_all"]) initial_data_loaded = django.dispatch.Signal(providing_args=["extname"]) register_postfix_maps = django.dispatch.Signal() -save_extra_form_fields = django.dispatch.Signal( - providing_args=["form", "instance", "cleaned_data"]) user_can_set_role = django.dispatch.Signal( providing_args=["user", "role", "account"]) user_login = django.dispatch.Signal(