Merge lp:~coolyashish/postorius/postorius into lp:postorius

[Ashish]

[Terri (terriko)]

Can you make sure that this code works correctly with @method_decorator(list_owner_required) so that the csv export is only available to list owners? It looks like this might need some code cleanup as well so that it matches the other code. (try running the pep8 checker, at least!)

review: Needs Fixing

[Terri (terriko)]

Other than that, it's looking like a great feature and I'd love to be able to merge it!

[lp:~coolyashish/postorius/postorius]

205. By Ashish on 2015-04-16

Pep8 + Owner check

[Ashish (coolyashish)]

Hi Terri,

I have added @list_owner_required. It is working fine with it. Also I had ran pep8 in both the files and did cleanup of the code.

Thanks

[Terri (terriko)]

Excellent! Can you run the tox tests as well? Also, it looks like you've got some leftovers from the merge, e.g. ("<<<<<<< TREE") that you might need to clean up.

We're just going to grab lunch, but I'll take a more detailed look at this when I get back in an hour or so.

review: Needs Fixing

[lp:~coolyashish/postorius/postorius]

206. By Ashish on 2015-04-16

Merge

[Terri (terriko)]

I fixed the errors and merged without waiting 'cause I need to catch my train soon!

review: Approve

[Ashish (coolyashish)]

Hi,

I have created a new branch https://code.launchpad.net/~coolyashish/postorius/CSV_EXPORT with propert testing with tox and Current remote changes merged into it.

[Ashish (coolyashish)]

Thanks :)

On Thu, Apr 16, 2015 at 11:56 PM, Ashish <email address hidden> wrote:

> Hi,
>
> I have created a new branch
> https://code.launchpad.net/~coolyashish/postorius/CSV_EXPORT with propert
> testing with tox and Current remote changes merged into it.
>
>
>
> --
> https://code.launchpad.net/~coolyashish/postorius/postorius/+merge/252088
> You are the owner of lp:~coolyashish/postorius/postorius.
>

=== modified file 'src/postorius/templates/postorius/lists/members.html'
--- src/postorius/templates/postorius/lists/members.html	2015-04-15 21:48:46 +0000
+++ src/postorius/templates/postorius/lists/members.html	2015-04-16 18:14:05 +0000
@@ -74,6 +74,10 @@
     		</tr>
         </thead>
     	<tbody>
+	    <form action="{% url 'csv_view' list.list_id %}" method="post" class="well"> {% csrf_token %}
+		     <button type="submit" class="btn">{% trans 'CSV Export' %}</button>
+	    </form>
+
             {% for member in list.member_page %}
                 <tr>
                     <td> <a href="{% url 'list_member_options' list.fqdn_listname member.email %}">

=== modified file 'src/postorius/urls.py'
--- src/postorius/urls.py	2015-04-15 21:48:46 +0000
+++ src/postorius/urls.py	2015-04-16 18:14:05 +0000
@@ -29,6 +29,8 @@
                                 url(r'^members/(?P<page>\d+)/$',
                                     ListMembersView.as_view(
                                     ), name='list_members_paged'),
+                                url(r'^csv_view/$',
+                                    'csv_view', name='csv_view'),
                                 url(r'^members/$',
                                     ListMembersView.as_view(
                                     ), name='list_members'),

=== modified file 'src/postorius/views/list.py'
--- src/postorius/views/list.py	2015-04-15 23:44:05 +0000
+++ src/postorius/views/list.py	2015-04-16 18:14:05 +0000
@@ -16,6 +16,9 @@
 # You should have received a copy of the GNU General Public License along with
 # Postorius.  If not, see <http://www.gnu.org/licenses/>.
 import logging
+import csv
+
+from django.http import HttpResponse
 
 from django.contrib import messages
 from django.contrib.auth.decorators import (login_required,
@@ -266,44 +269,108 @@
         return redirect('mass_subscribe', self.mailing_list.list_id)
 
 
-class ListMassRemovalView(MailingListView):
-
-    """Class For Mass Removal"""
-
-    @method_decorator(list_owner_required)
-    def get(self, request, *args, **kwargs):
-        form = ListMassRemoval()
-        return render_to_response('postorius/lists/mass_removal.html',
-                                  {'form': form, 'list': self.mailing_list},
-                                  context_instance=RequestContext(request))
-
-    @method_decorator(list_owner_required)
-    def post(self, request, *args, **kwargs):
-        form = ListMassRemoval(request.POST)
-        if not form.is_valid():
-            messages.error(request, 'Please fill out the form correctly.')
-        else:
-            emails = request.POST["emails"].splitlines()
-            for email in emails:
-                try:
-                    validate_email(email)
-                    self.mailing_list.unsubscribe(email.lower())
-                    messages.success(request,
-                                    'The address %s has been unsubscribed from %s.' %
-                                    (email, self.mailing_list.fqdn_listname))
-                except MailmanApiError:
-                    return utils.render_api_error(request)
-                except HTTPError, e:
-                    messages.error(request, e)
-                except ValueError, e:
-                    messages.error(request, e)
-                except ValidationError:
-                    messages.error(request,
-                                  'The email address %s is not valid.' %
-                                  email)
-        return redirect('mass_removal', self.mailing_list.list_id)
-
-
+<<<<<<< TREE
+class ListMassRemovalView(MailingListView):
+
+    """Class For Mass Removal"""
+
+    @method_decorator(list_owner_required)
+    def get(self, request, *args, **kwargs):
+        form = ListMassRemoval()
+        return render_to_response('postorius/lists/mass_removal.html',
+                                  {'form': form, 'list': self.mailing_list},
+                                  context_instance=RequestContext(request))
+
+    @method_decorator(list_owner_required)
+    def post(self, request, *args, **kwargs):
+        form = ListMassRemoval(request.POST)
+        if not form.is_valid():
+            messages.error(request, 'Please fill out the form correctly.')
+        else:
+            emails = request.POST["emails"].splitlines()
+            for email in emails:
+                try:
+                    validate_email(email)
+                    self.mailing_list.unsubscribe(email.lower())
+                    messages.success(request,
+                                    'The address %s has been unsubscribed from %s.' %
+                                    (email, self.mailing_list.fqdn_listname))
+                except MailmanApiError:
+                    return utils.render_api_error(request)
+                except HTTPError, e:
+                    messages.error(request, e)
+                except ValueError, e:
+                    messages.error(request, e)
+                except ValidationError:
+                    messages.error(request,
+                                  'The email address %s is not valid.' %
+                                  email)
+        return redirect('mass_removal', self.mailing_list.list_id)
+
+
+=======
+class ListMassRemovalView(MailingListView):
+
+    """Class For Mass Removal"""
+
+    @method_decorator(list_owner_required)
+    def get(self, request, *args, **kwargs):
+        form = ListMassRemoval()
+        return render_to_response('postorius/lists/mass_removal.html',
+                                  {'form': form, 'list': self.mailing_list},
+                                  context_instance=RequestContext(request))
+
+    @method_decorator(list_owner_required)
+    def post(self, request, *args, **kwargs):
+        form = ListMassRemoval(request.POST)
+        if not form.is_valid():
+            messages.error(request, 'Please fill out the form correctly.')
+        else:
+            emails = request.POST["emails"].splitlines()
+            for email in emails:
+                try:
+                    validate_email(email)
+                    self.mailing_list.unsubscribe(email.lower())
+                    messages.success(request,
+                                    'The address %s has been unsubscribed from %s.' %
+                                    (email, self.mailing_list.fqdn_listname))
+                except MailmanApiError:
+                    return utils.render_api_error(request)
+                except HTTPError, e:
+                    messages.error(request, e)
+                except ValueError, e:
+                    messages.error(request, e)
+                except ValidationError:
+                    messages.error(request,
+                                  'The email address %s is not valid.' %
+                                  email)
+        return redirect('mass_removal', self.mailing_list.list_id)
+
+
+@list_owner_required
+def csv_view(request, list_id):
+    """Export all the subscriber in csv
+    """
+    mm_lists = []
+    try:
+        client = utils.get_client()
+        mm_lists = client.get_list(list_id)
+    except MailmanApiError:
+        return utils.render_api_error(request)
+
+    response = HttpResponse(content_type='text/csv')
+    response['Content-Disposition'] = (
+        'attachment; filename="Subscribers.csv"')
+
+    writer = csv.writer(response)
+    if mm_lists:
+        for i in mm_lists.members:
+            writer.writerow([i.email])
+
+    return response
+
+
+>>>>>>> MERGE-SOURCE
 def _get_choosable_domains(request):
     try:
         domains = Domain.objects.all()