Merge 6e58797 into ec6f5e3

andela · Oct 4, 2018 · bf8621a · bf8621a
2 parents ec6f5e3 + 6e58797
commit bf8621a
Show file tree

Hide file tree

Showing 7 changed files with 4 additions and 236 deletions.
diff --git a/.gitignore b/.gitignore
@@ -112,4 +112,4 @@ db.sqlite3
 tmp
 my_env
 
-#migrations
+migrations
diff --git a/authors/apps/articles/migrations/0001_initial.py b/authors/apps/articles/migrations/0001_initial.py
diff --git a/authors/apps/articles/migrations/0002_auto_20180924_1007.py b/authors/apps/articles/migrations/0002_auto_20180924_1007.py
diff --git a/authors/apps/articles/models.py b/authors/apps/articles/models.py
@@ -187,7 +187,7 @@ class ArticleReport(models.Model):
     Model for creating reports made on articles
     """
     article = models.ForeignKey(
-        Article, blank=False, null=False, on_delete=models.CASCADE)
+        Article, blank=False, null=False, on_delete=models.CASCADE, default=0)
     user = models.ForeignKey(
         User, blank=False, null=False, on_delete=models.CASCADE)
     report_message = models.TextField(blank=True, null=True)

diff --git a/authors/apps/authentication/migrations/0001_initial.py b/authors/apps/authentication/migrations/0001_initial.py
diff --git a/authors/apps/profiles/migrations/0001_initial.py b/authors/apps/profiles/migrations/0001_initial.py
diff --git a/authors/settings/base.py b/authors/settings/base.py
@@ -48,6 +48,7 @@
 ]
 
 MIDDLEWARE = [
+    'corsheaders.middleware.CorsMiddleware',
     'django.middleware.security.SecurityMiddleware',
     'django.contrib.sessions.middleware.SessionMiddleware',
     'django.middleware.common.CommonMiddleware',
@@ -131,6 +132,7 @@
     '0.0.0.0:4000',
     'localhost:4000',
 )
+CORS_ORIGIN_ALLOW_ALL = True
 
 # Tell Django about the custom `User` model we created. The string
 # `authentication.User` tells Django we are referring to the `User` model in