Delete Approvals app; that's a part of Files

apps/admin/fixtures/admin/tests/flagged.json

@@ -129,7 +129,38 @@
     },
     {
         "pk": 1,
-        "model": "approvals.approval",
+        "model": "files.platform",
+        "fields": {
+            "name": null,
+            "shortname": null,
+            "icontype": "image/png"
+        }
+    },
+    {
+        "pk": 1,
+        "model": "files.file",
+        "fields": {
+            "version": 39083,
+            "platform": 1,
+            "filename": "sweetaddon-fx-1.0.xpi",
+            "hash": "sha256:3d690208f3a50b8be4d7cc0a696dd3970d2bf1e32813274199cab99c66917781",
+            "status": "1"
+        }
+    },
+    {
+        "pk": 2,
+        "model": "files.file",
+        "fields": {
+            "version": 2,
+            "platform": 1,
+            "filename": "suckyaddon-fx-1.0.xpi",
+            "hash": "sha256:0934704605d5976734711897ad2d5c91390f6792ee7352d2c6019cfd77367ce1",
+            "status": "4"
+        }
+    },
+    {
+        "pk": 1,
+        "model": "files.approval",
         "fields": {
             "created": "2009-10-20 15:38:57",
             "user": 4230,
@@ -139,12 +170,13 @@
             "action": 3,
             "reply_to": null,
             "os": "",
-            "addon": 1
+            "addon": 1,
+            "file": 1
         }
     },
     {
         "pk": 3,
-        "model": "approvals.approval",
+        "model": "files.approval",
         "fields": {
             "created": "2009-10-20 15:38:57",
             "user": 4230,
@@ -154,7 +186,8 @@
             "action": 2,
             "reply_to": null,
             "os": "",
-            "addon": 3
+            "addon": 3,
+            "file": 2
         }
     }
 ]

apps/admin/tests/test_views.py

@@ -6,7 +6,7 @@ from caching import cache
 
 from amo.urlresolvers import reverse
 from addons.models import Addon
-from approvals.models import Approval
+from files.models import Approval
 from versions.models import Version
 
 

apps/admin/views.py

@@ -5,7 +5,7 @@ import jingo
 
 import amo
 from addons.models import Addon
-from approvals.models import Approval
+from files.models import Approval
 from versions.models import Version
 
 

apps/approvals/models.py

@@ -1,20 +0,0 @@
-from django.db import models
-
-import amo
-
-
-class Approval(amo.ModelBase):
-
-    reviewtype = models.CharField(max_length=10, default='pending')
-    action = models.IntegerField(default=0)
-    os = models.CharField(max_length=255, default='')
-    applications = models.CharField(max_length=255, default='')
-    comments = models.TextField(null=True)
-
-    addon = models.ForeignKey('addons.Addon')
-    user = models.ForeignKey('users.UserProfile')
-    #file = models.ForeignKey('files.File')
-    reply_to = models.ForeignKey('self', null=True, db_column='reply_to')
-
-    class Meta(amo.ModelBase.Meta):
-        db_table = 'approvals'

apps/files/models.py

@@ -22,6 +22,23 @@ class File(amo.ModelBase):
         db_table = 'files'
 
 
+class Approval(amo.ModelBase):
+
+    reviewtype = models.CharField(max_length=10, default='pending')
+    action = models.IntegerField(default=0)
+    os = models.CharField(max_length=255, default='')
+    applications = models.CharField(max_length=255, default='')
+    comments = models.TextField(null=True)
+
+    addon = models.ForeignKey('addons.Addon')
+    user = models.ForeignKey('users.UserProfile')
+    file = models.ForeignKey(File)
+    reply_to = models.ForeignKey('self', null=True, db_column='reply_to')
+
+    class Meta(amo.ModelBase.Meta):
+        db_table = 'approvals'
+
+
 class Platform(amo.ModelBase):
     name = TranslatedField()
     shortname = TranslatedField()

settings.py

@@ -119,7 +119,6 @@ INSTALLED_APPS = (
     'access',
     'addons',
     'admin',
-    'approvals',
     'applications',
     'bandwagon',
     'devhub',