Add attached files to report. Fix mozillahispano#26

bbotella · Nov 9, 2013 · 73ff61e · 73ff61e
1 parent 618d588
commit 73ff61e
Show file tree

Hide file tree

Showing 6 changed files with 39 additions and 4 deletions.
diff --git a/mozbuzz/buzz/forms.py b/mozbuzz/buzz/forms.py
@@ -7,7 +7,7 @@ class Meta:
         fields = ('link', 'origin', 'source_name', 'text', 'type', 'feedback', 'country',
                   'author_expertise', 'previous_product_comments', 'product',
                   'estimated_audience', 'relevant_audience', 'update_rate',
-                  'remarks')
+                  'remarks', 'file1', 'file2', 'file3')
         widgets = {
             "source_name": TextInput
         }

diff --git a/mozbuzz/buzz/migrations/0001_initial.py b/mozbuzz/buzz/migrations/0001_initial.py
@@ -99,6 +99,9 @@ def forwards(self, orm):
             ('relevant_audience', self.gf('django.db.models.fields.BooleanField')(default=False)),
             ('update_rate', self.gf('django.db.models.fields.IntegerField')(max_length=1)),
             ('remarks', self.gf('django.db.models.fields.TextField')()),
+            ('file1', self.gf('django.db.models.fields.TextField')()),
+            ('file2', self.gf('django.db.models.fields.TextField')()),
+            ('file3', self.gf('django.db.models.fields.TextField')()),
         ))
         db.send_create_signal('buzz', ['Mention'])
 

diff --git a/mozbuzz/buzz/models.py b/mozbuzz/buzz/models.py
@@ -178,6 +178,9 @@ class Mention(SoftDeletableModel):
     relevant_audience = models.BooleanField()
     update_rate = models.IntegerField(max_length=1, choices=UPDATE_RATE)
     remarks = models.TextField(null=True, blank=True)
+    file1 = models.FileField(upload_to='report_files/', blank=True, null=True)
+    file2 = models.FileField(upload_to='report_files/', blank=True, null=True)
+    file3 = models.FileField(upload_to='report_files/', blank=True, null=True)
 
     def __unicode__(self):
         return "%s @ %s" %(self.type, self.source_name)

diff --git a/mozbuzz/buzz/templates/buzz/mention.html b/mozbuzz/buzz/templates/buzz/mention.html
@@ -1,7 +1,7 @@
 {% extends "base.html" %}{% load i18n query %}
 
 {% block main_content %}
-    <form method="post"
+    <form method="post" enctype="multipart/form-data",
     {% if pk %}
         action="{% url "edit" pk %}"
     {% else %}

diff --git a/mozbuzz/buzz/templates/buzz/mention_view.html b/mozbuzz/buzz/templates/buzz/mention_view.html
@@ -46,6 +46,24 @@
                         <span>{%trans "Relevant audience"%}</span>
                     </li>
                     {% endif %}
+                    {% if mention.file1 != None %}
+                        <li>
+                            <span>{%trans "File 1"%}</span>
+                            <a href="../media/{{ mention.file1 }}">{{ mention.file1 }}</a>
+                        </li>
+                    {% endif %}
+                    {% if mention.file2 != '' %}
+                        <li>
+                            <span>{%trans "File 2"%}</span>
+                            <a href="../media/{{ mention.file2 }}">{{ mention.file2 }}</a>
+                        </li>
+                    {% endif %}
+                    {% if mention.file3 != None %}
+                        <li>
+                            <span>{%trans "File 3"%}</span>
+                            <a href="../media/{{ mention.file3 }}">{{ mention.file3 }}</a>
+                        </li>
+                    {% endif %}
                 </ul>
                 <div style="display:none" class="followups">
                     {% for followup in mention.followups %}

diff --git a/mozbuzz/buzz/views.py b/mozbuzz/buzz/views.py
@@ -36,6 +36,12 @@ def about(request):
     pass #TODO
 
 
+
+def handle_uploaded_file(f):
+    with open(str(f), 'wb+') as destination:
+        for chunk in f.chunks():
+            destination.write(chunk)
+
 @login_required
 @mozview
 def mention(request, pk=None):
@@ -45,12 +51,17 @@ def mention(request, pk=None):
             instance = Mention(creation_user=request.user)
         else:
             instance = Mention.enabled.get(pk=pk)
-        form = MentionForm(request.POST, instance=instance)
+        form = MentionForm(request.POST, request.FILES, instance=instance)
         if form.is_valid():
             instance = form.save(commit=False)
             instance.last_update_user = request.user
+            if 'file1' in request.FILES:
+                instance.file1.save(request.FILES['file1'].name, request.FILES['file1'])
+            if 'file2' in request.FILES:
+                instance.file2.save(request.FILES['file2'].name, request.FILES['file2'])
+            if 'file3' in request.FILES:
+                instance.file3.save(request.FILES['file3'].name, request.FILES['file3'])
             instance.save()
-
             if "rsspost_hide" in request.POST:
                 RSSPost.objects.filter(pk=int(request.POST["rsspost_hide"])).delete()