Changeset 181:c66e64ccb02f

Timestamp:

Nov 20, 2009 4:25:14 PM (4 years ago)

Author:

slav0nic <slav0nic0@…>

Branch:

default

Message:

Fix #56: attachments does not work

Location:

djangobb/apps/forum

Files:

• forms.py (modified) (2 diffs)
• views.py (modified) (2 diffs)

djangobb/apps/forum/forms.py

@@ -81 +81 @@
 
 
-    def save(self, commit=True):
+    def save(self):
         if self.forum:
             topic = Topic(forum=self.forum,
@@ -93 +93 @@
                     markup='bbcode',
                     body=self.cleaned_data['body'])
-        
+
+        post.save()
         if forum_settings.ATTACHMENT_SUPPORT:
             self.save_attachment(post, self.cleaned_data['attachment'])
-
-        if commit:
-            post.save()
         return post
+
 
     def save_attachment(self, post, memfile):

djangobb/apps/forum/views.py

@@ -13 +13 @@
 from django.utils import translation
 from django.db.models import Q, F, Sum
-
+from django.utils.encoding import smart_str
 
 from forum.util import render_to, paged, build_form, paginate, set_language
@@ -791 +791 @@
 def show_attachment(request, hash):
     attachment = get_object_or_404(Attachment, hash=hash)
-    file_obj = file(attachment.get_absolute_path())
-    response = HttpResponse(file_obj, content_type=attachment.content_type)
-    response['Content-Disposition'] = 'attachment; filename=%s' % attachment.name.encode('utf-8', 'ignore')
+    file_data = file(attachment.get_absolute_path()).read()
+    response = HttpResponse(file_data, mimetype=attachment.content_type)
+    response['Content-Disposition'] = 'attachment; filename=%s' % smart_str(attachment.name)
     return response