From 4869e5516825d2ee439bcfbb12fc9262d982d8de Mon Sep 17 00:00:00 2001 From: Marc Aymerich Date: Wed, 7 Oct 2015 12:34:50 +0000 Subject: [PATCH] Improved select account forms --- orchestra/contrib/accounts/admin.py | 3 ++- .../admin/accounts/account/change_form.html | 4 ++- .../accounts/account/select_account_list.html | 3 +-- orchestra/contrib/mailboxes/admin.py | 26 ++++++++++++++----- orchestra/contrib/mailboxes/forms.py | 6 ++--- 5 files changed, 28 insertions(+), 14 deletions(-) diff --git a/orchestra/contrib/accounts/admin.py b/orchestra/contrib/accounts/admin.py index a5dad576..01de11a2 100644 --- a/orchestra/contrib/accounts/admin.py +++ b/orchestra/contrib/accounts/admin.py @@ -333,7 +333,7 @@ class SelectAccountAdminMixin(AccountAdminMixin): info = opts.app_label, opts.model_name account_list = AccountListAdmin(Account, admin_site).changelist_view select_urls = [ - url("/select-account/$", + url("add/select-account/$", wrap_admin_view(self, account_list), name='%s_%s_select_account' % info), ] @@ -355,6 +355,7 @@ class SelectAccountAdminMixin(AccountAdminMixin): context = { 'title': _("Add %s for %s") % (opts.verbose_name, self.account.username), 'from_account': bool(from_account_id), + 'from_select': True, 'account': self.account, 'account_opts': Account._meta, } diff --git a/orchestra/contrib/accounts/templates/admin/accounts/account/change_form.html b/orchestra/contrib/accounts/templates/admin/accounts/account/change_form.html index 66962963..d4404031 100644 --- a/orchestra/contrib/accounts/templates/admin/accounts/account/change_form.html +++ b/orchestra/contrib/accounts/templates/admin/accounts/account/change_form.html @@ -9,11 +9,13 @@ › {{ account_opts.app_config.verbose_name }} › {{ account_opts.verbose_name_plural|capfirst }} › {{ account|truncatewords:"18" }} -› {% if has_change_permission %}{{ opts.verbose_name_plural|capfirst }}{% else %}{{ opts.verbose_name_plural|capfirst }}{% endif %} {% else %} › {{ opts.app_config.verbose_name }} › {% if has_change_permission %}{{ opts.verbose_name_plural|capfirst }}{% else %}{{ opts.verbose_name_plural|capfirst }}{% endif %} {% endif %} +{% if from_select %} +› {% blocktrans with name=original_opts.verbose_name %}Select {{ name }} account{% endblocktrans %} +{% endif %} › {% if add %}{% trans 'Add' %} {{ opts.verbose_name }}{% else %}{{ original|truncatewords:"18" }}{% endif %} {% endblock %} diff --git a/orchestra/contrib/accounts/templates/admin/accounts/account/select_account_list.html b/orchestra/contrib/accounts/templates/admin/accounts/account/select_account_list.html index e47bff48..bb60f3ad 100644 --- a/orchestra/contrib/accounts/templates/admin/accounts/account/select_account_list.html +++ b/orchestra/contrib/accounts/templates/admin/accounts/account/select_account_list.html @@ -7,8 +7,7 @@ {% trans 'Home' %} › {{ original_opts.app_config.verbose_name }} › {{ original_opts.verbose_name_plural|capfirst }} -› {% trans 'Add' %} {{ original_opts.verbose_name }} -› {% trans 'Select account' %} +› {% blocktrans with name=original_opts.verbose_name %}Select {{ name }} account{% endblocktrans %} {% endblock %} diff --git a/orchestra/contrib/mailboxes/admin.py b/orchestra/contrib/mailboxes/admin.py index 9f764869..97544f43 100644 --- a/orchestra/contrib/mailboxes/admin.py +++ b/orchestra/contrib/mailboxes/admin.py @@ -124,10 +124,19 @@ class MailboxAdmin(ChangePasswordAdminMixin, SelectAccountAdminMixin, ExtendedMo search_term = search_term.replace('@', ' ') return super(MailboxAdmin, self).get_search_results(request, queryset, search_term) - def render_change_form(self, request, context, *args, **kwargs): + def render_change_form(self, request, context, add=False, change=False, form_url='', obj=None): + if not add: + self.check_unrelated_address(request, obj) + return super(MailboxAdmin, self).render_change_form( + request, context, add, change, form_url, obj) + + def log_addition(self, request, object): + self.check_unrelated_address(request, object) + return super(MailboxAdmin, self).log_addition(request, object) + + def check_unrelated_address(self, request, obj): # Check if there exists an unrelated local Address for this mbox local_domain = settings.MAILBOXES_LOCAL_DOMAIN - obj = kwargs['obj'] if local_domain and obj.name: non_mbox_addresses = Address.objects.exclude(mailboxes__name=obj.name).exclude( forward__regex=r'.*(^|\s)+%s($|\s)+.*' % obj.name) @@ -137,11 +146,14 @@ class MailboxAdmin(ChangePasswordAdminMixin, SelectAccountAdminMixin, ExtendedMo pass else: url = reverse('admin:mailboxes_address_change', args=(addr.pk,)) - msg = _("Address {addr} clashes with this mailbox " - "local address. Consider adding this mailbox to the address.").format( - url=url, addr=addr) - self.message_user(request, mark_safe(msg), level=messages.WARNING) - return super(MailboxAdmin, self).render_change_form(request, context, *args, **kwargs) + msg = mark_safe( + _("Address {addr} clashes with '{mailbox}' mailbox " + "local address. Consider adding this mailbox to the address.").format( + mailbox=obj.name, url=url, addr=addr) + ) + # Prevent duplication (add_view+continue) + if msg not in (m.message for m in messages.get_messages(request)): + self.message_user(request, msg, level=messages.WARNING) def save_model(self, request, obj, form, change): """ save hacky mailbox.addresses and local domain clashing """ diff --git a/orchestra/contrib/mailboxes/forms.py b/orchestra/contrib/mailboxes/forms.py index 16034c6f..326c7297 100644 --- a/orchestra/contrib/mailboxes/forms.py +++ b/orchestra/contrib/mailboxes/forms.py @@ -57,7 +57,7 @@ class MailboxForm(forms.ModelForm): else: if addr not in cleaned_data.get('addresses', []): raise ValidationError({ - 'addresses': _("This mailbox matches local address '%s', " + 'addresses': _("This mailbox local address matche '%s', " "please make explicit this fact by selecting it.") % addr }) return cleaned_data @@ -98,7 +98,7 @@ class AddressForm(forms.ModelForm): if mailbox.name == name: return raise ValidationError( - _("This address matches mailbox '%s', please make explicit this fact " - "by adding the mailbox on the mailboxes or forward field.") % name + _("This address matches mailbox '%s' local address, please make explicit " + "this fact by adding the mailbox on the mailboxes or forward field.") % name ) return cleaned_data