Download as
Browse Code »

Commit f21f3dd5dcd6d92d9fb0a597ff9b9740fdf05723

Authored by Luan
1 parent c3f16f94
Exists in master and in 39 other branches 1.12.x, add_requests_as_dep, celery_service, change-passwd-signal, check-port, colab-signals, colab-vcard, colab_search, colab_tag, colab_tag_merge, community_association, detach_super_archives, fix-dashboard, fix-message-preview, fix_app_label, fix_cache_count_spb, fix_header, fixed_gitlab_import, go_to_profile_panel, header_footer, layout-fix, mobile_user_scalable, move_out_plugins, paginate-threads, profile_integration, refactor-data-import, remove-gitlab-plugin, removing_namespace, search_block, search_filters, spb-release/3.0, split_screen, stable, startplugin, timestamp_plugins, translation_review, user_regex, validate-passwd, workin_whoosh_temp

Adding list description on user create form - closes #102

Showing 1 changed file with 5 additions and 1 deletions   Show diff stats
src/accounts/forms.py
  Diff comments   View file @f21f3dd
@@ -6,6 +6,7 @@ from django.utils.translation import ugettext_lazy as _ @@ -6,6 +6,7 @@ from django.utils.translation import ugettext_lazy as _
6 6
7 from conversejs.models import XMPPAccount 7 from conversejs.models import XMPPAccount
8 8
  9 +from accounts.utils import mailman
9 from super_archives.models import MailingList 10 from super_archives.models import MailingList
10 from .utils.validators import validate_social_account 11 from .utils.validators import validate_social_account
11 12
@@ -68,7 +69,10 @@ class UserUpdateForm(UserForm): @@ -68,7 +69,10 @@ class UserUpdateForm(UserForm):
68 69
69 70
70 class ListsForm(forms.Form): 71 class ListsForm(forms.Form):
71 - LISTS_NAMES = ((list.name, list.name) for list in MailingList.objects.all()) 72 + LISTS_NAMES = ((
  73 + listname, u'{} ({})'.format(listname, description)
  74 + ) for listname, description in mailman.all_lists(description=True))
  75 +
72 lists = forms.MultipleChoiceField(label=_(u'Mailing lists'), 76 lists = forms.MultipleChoiceField(label=_(u'Mailing lists'),
73 required=False, 77 required=False,
74 widget=forms.CheckboxSelectMultiple, 78 widget=forms.CheckboxSelectMultiple,