commit 3663569888f45a3951e4cac8a0806f83801b66d5
author Dirk Vogt <dirk@fairphone.com> Mon Oct 17 12:19:10 2016 +0200
committer Dirk Vogt <dirk@fairphone.com> Mon Oct 17 12:19:59 2016 +0200
tree 5218b1887251c3f1e648317651fb8097b0d29ebe
parent 0d9d5d2a364aa4e11cf45904c4ce9389a3e64a1b

Use proper Status code in tests| ADD Logfile upload

crashreports/models.py

diff --git a/crashreports/models.py b/crashreports/models.py
index be44b57..0a06a6f 100644
--- a/crashreports/models.py
+++ b/crashreports/models.py
@@ -42,8 +42,8 @@
 def crashreport_file_name(instance, filename):
     return '/'.join([
         "crashreport_uploads",
-        instance.device.uuid,
-        instance.crashreport.id,
+        instance.crashreport.device.uuid,
+        str(instance.crashreport.id),
         str(instance.crashreport.date),
         filename])
 
@@ -60,7 +60,7 @@
     date = models.DateTimeField()
     tags = TaggableManager(blank=True)
     device_local_id = models.PositiveIntegerField(blank=True)
-    next_crashreport_key = models.PositiveIntegerField(default=1)
+    next_logfile_key = models.PositiveIntegerField(default=1)
 
     @transaction.atomic
     def get_logfile_key(self):
@@ -87,8 +87,8 @@
     crashreport_local_id = models.PositiveIntegerField(blank=True)
 
     def save(self, *args, **kwargs):
-        if not self.device_local_id:
-            self.device_local_id = self.crashreport.next_logfile_key()
+        if not self.crashreport_local_id:
+            self.crashreport_local_id = self.crashreport.get_logfile_key()
         super(LogFile, self).save(*args, **kwargs)