Merge pull request #144 from TracyWebTech/adding_groups_description

Adding groups description

Merge pull request #144 from TracyWebTech/adding_groups_description
Adding groups description
Sergio Oliveira
2 parents ad4d92eb c6b6d83a
Showing 5 changed files with 27 additions and 10 deletions Show diff stats
src/accounts/templates/accounts/manage_subscriptions.html
src/accounts/utils/mailman.py
src/accounts/views.py
src/super_archives/templates/superarchives/thread-dashboard.html
src/super_archives/views.py
@@ -21,7 +21,7 @@
             {% for list, checked in lists %}
               <div class="checkbox">
                 <label>
-                  <input name="{{ email }}" value="{{ list }}" type="checkbox" {% if checked %}checked{% endif%}>{{ list }}</input>
+                  <input name="{{ email }}" value="{{ list.listname }}" type="checkbox" {% if checked %}checked{% endif%} title="{{ list.description }}">{{ list.listname }}</input>
                 </label>
               </div>
             {% endfor %}
@@ -44,18 +44,22 @@ def update_subscription(address, lists):
             subscribe(maillist, address)
-def address_lists(address):
+def address_lists(address, description=''):
     url = get_url()
+
+    params = {'address': address,
+              'description': description}
+
     try:
-        lists = requests.get(url, timeout=TIMEOUT, params={'address': address})
+        lists = requests.get(url, timeout=TIMEOUT, params=params)
     except requests.exceptions.RequestException:
         return []
     return lists.json()
-def all_lists():
-    return address_lists('')
+def all_lists(*args, **kwargs):
+    return address_lists('', *args, **kwargs)
 def user_lists(user):
@@ -65,3 +69,10 @@ def user_lists(user):
         list_set.update(address_lists(email))
     return tuple(list_set)
+
+
+def get_list_description(listname, lists=None):
+    if not lists:
+        lists = dict(all_lists(description=True))
+
+    return lists.get(listname)
@@ -174,17 +174,20 @@ class ManageUserSubscriptionsView(UserProfileBaseMixin, DetailView):
         user = self.get_object()
         emails = user.emails.values_list('address', flat=True)
-        all_lists = mailman.all_lists()
+        all_lists = mailman.all_lists(description=True)
         for email in emails:
             lists = []
             lists_for_address = mailman.address_lists(email)
-            for listname in all_lists:
+            for listname, description in all_lists:
                 if listname in lists_for_address:
                     checked = True
                 else:
                     checked = False
-                lists.append((listname, checked))
+                lists.append((
+                    {'listname': listname, 'description': description},
+                    checked
+                ))
             context['membership'].update({email: lists})
@@ -5,9 +5,9 @@
   <h2>{% trans 'Groups'|title %}</h2>
   <hr/>
-  {% for listname, latest, most_relevant in lists %}
+  {% for listname, description, latest, most_relevant in lists %}
     {% if latest or most_relevant %}
-      <h3 class="text-center"><b>{{ listname|title }}</b></h3>
+      <h3 class="text-center"><b>{{ listname|title }} {% if description %} ({{ description }}){% endif %}</b></h3>
       <hr/>
       <div class="row">
@@ -20,6 +20,7 @@ from django.shortcuts import render, redirect, get_object_or_404
 from haystack.query import SearchQuerySet
+from accounts.utils import mailman
 from .utils.email import send_verification_email
 from .models import MailingList, Thread, EmailAddress, \
                     EmailAddressValidation, Message
@@ -120,12 +121,14 @@ class ThreadDashboardView(View):
     def get(self, request):
         MAX = 6
         context = {}
+        all_lists = mailman.all_lists(description=True)
         context['lists'] = []
         lists = MailingList.objects.filter()
         for list_ in MailingList.objects.order_by('name'):
             context['lists'].append((
                 list_.name,
+                mailman.get_list_description(list_.name, all_lists),
                 list_.thread_set.filter(spam=False).order_by(
                     '-latest_message__received_time'
                 )[:MAX],
	@@ -21,7 +21,7 @@		@@ -21,7 +21,7 @@
21	{% for list, checked in lists %}	21	{% for list, checked in lists %}
22	<div class="checkbox">	22	<div class="checkbox">
23	<label>	23	<label>
24	- <input name="{{ email }}" value="{{ list }}" type="checkbox" {% if checked %}checked{% endif%}>{{ list }}</input>	24	+ <input name="{{ email }}" value="{{ list.listname }}" type="checkbox" {% if checked %}checked{% endif%} title="{{ list.description }}">{{ list.listname }}</input>
25	</label>	25	</label>
26	</div>	26	</div>
27	{% endfor %}	27	{% endfor %}
	@@ -5,9 +5,9 @@		@@ -5,9 +5,9 @@
5	<h2>{% trans 'Groups'\|title %}</h2>	5	<h2>{% trans 'Groups'\|title %}</h2>
6	<hr/>	6	<hr/>
7		7
8	- {% for listname, latest, most_relevant in lists %}	8	+ {% for listname, description, latest, most_relevant in lists %}
9	{% if latest or most_relevant %}	9	{% if latest or most_relevant %}
10	- <h3 class="text-center"><b>{{ listname\|title }}</b></h3>	10	+ <h3 class="text-center"><b>{{ listname\|title }} {% if description %} ({{ description }}){% endif %}</b></h3>
11	<hr/>	11	<hr/>
12		12
13	<div class="row">	13	<div class="row">