X-Git-Url: https://git.ozlabs.org/?a=blobdiff_plain;f=apps%2Fpatchwork%2Fviews%2Fbundle.py;h=3fb47e2fa5a91848e7b7eb95cb6d11076db9e78c;hb=04e6689193c778fcfbff192e8d34af1dadf6560e;hp=3c89338b40ef6ec1f518eb25ca7a2a6b9186da8c;hpb=5d0140ef04ababd93c45b5126ee1b412bd778da5;p=patchwork diff --git a/apps/patchwork/views/bundle.py b/apps/patchwork/views/bundle.py index 3c89338..3fb47e2 100644 --- a/apps/patchwork/views/bundle.py +++ b/apps/patchwork/views/bundle.py @@ -26,7 +26,7 @@ import django.core.urlresolvers from patchwork.models import Patch, Bundle, BundlePatch, Project from patchwork.utils import get_patch_ids from patchwork.forms import BundleForm, DeleteBundleForm -from patchwork.views import generic_list +from patchwork.views import generic_list, patch_to_mbox from patchwork.filters import DelegateFilter @login_required @@ -179,7 +179,7 @@ def bundle(request, username, bundlename): 'bundlename': bundle.name}, filter_settings = filter_settings, patches = bundle.ordered_patches(), - editable_order = True) + editable_order = is_owner) context['bundle'] = bundle context['bundleform'] = form @@ -193,10 +193,14 @@ def mbox(request, username, bundlename): if not (request.user == bundle.owner or bundle.public): return HttpResponseNotFound() - response = HttpResponse(mimetype='text/plain') + mbox = '\n'.join([patch_to_mbox(p).as_string(True) + for p in bundle.ordered_patches()]) + + response = HttpResponse(content_type='text/plain') response['Content-Disposition'] = \ 'attachment; filename=bundle-%d-%s.mbox' % (bundle.id, bundle.name) - response.write(bundle.mbox()) + + response.write(mbox) return response @login_required