dotwaffle · maznu · Jun 21, 2020
diff --git a/pinder/peering_requests/models.py b/pinder/peering_requests/models.py
@@ -20,12 +20,12 @@ class Request(models.Model):
     )
 
     sender = models.ForeignKey(
-        settings.AUTH_USER_MODEL, related_name="requests_received")
-    receiver = models.ForeignKey("users.Isp", related_name="requests_sent")
+        settings.AUTH_USER_MODEL, related_name="requests_received", on_delete=models.CASCADE)
+    receiver = models.ForeignKey("users.Isp", related_name="requests_sent", on_delete=models.CASCADE)
     ixlan_id = models.PositiveIntegerField()
 
     state = models.CharField(
-        choices=STATES, default=STATE_WAITING, max_length=8)
+        choices=STATES, default=STATE_WAITING, max_length=12)
 
     sender_is_ready = models.BooleanField(default=False)
     receiver_is_ready = models.BooleanField(default=False)

diff --git a/pinder/peering_requests/templates/peering_requests/acceptance.html b/pinder/peering_requests/templates/peering_requests/acceptance.html
@@ -1,5 +1,5 @@
 {% extends 'pinder/base.html' %}
-{% load staticfiles %}
+{% load static %}
 {% block body %}
     <div class="margin-top-50" ng-controller="PinderController" ng-init="getRequest('{{ object.id }}')">
     <p class="text"><strong>Pinder</strong> Swipe Right On A New Peering Relationship!</p>

diff --git a/pinder/peering_requests/templates/peering_requests/listing.html b/pinder/peering_requests/templates/peering_requests/listing.html
@@ -1,5 +1,5 @@
 {% extends 'pinder/base.html' %}
-{% load staticfiles %}
+{% load static %}
 {% block body %}
     <div class="margin-top-50" ng-controller="PinderController" ng-init="getRequests()">
         <p class="text"><strong>Pinder</strong> Swipe Right On A New Peering Relationship!</p>

diff --git a/pinder/pinder/templates/pinder/base.html b/pinder/pinder/templates/pinder/base.html
@@ -1,4 +1,4 @@
-{% load staticfiles %}
+{% load static %}
 <!doctype html>
 <html xmlns="http://www.w3.org/1999/html">
 

diff --git a/pinder/pinder/templates/pinder/index.html b/pinder/pinder/templates/pinder/index.html
@@ -1,7 +1,7 @@
 {% extends 'pinder/base.html' %}
 
 
-{% load staticfiles %}
+{% load static %}
 
 
 {% block body %}

diff --git a/pinder/pinder/templates/rest_framework/api.html b/pinder/pinder/templates/rest_framework/api.html
@@ -1,7 +1,7 @@
 {% extends "rest_framework/base.html" %}
 
 
-{% load staticfiles %}
+{% load static %}
 
 
 {% block title %}Pinder :: API{% endblock title %}

diff --git a/pinder/pinder/urls.py b/pinder/pinder/urls.py
@@ -13,13 +13,14 @@
 router = DefaultRouter()
 router.register(r'requests', RequestViewSet)
 
+app_name = 'pinder'
 urlpatterns = [
 
     url(
         r"^api/auth/",
         include('rest_framework.urls', namespace="rest_framework")
     ),
-    url(r"^api/", include(router.urls, namespace="drf")),
+    url(r"^api/", include((router.urls, 'rest_framework'), namespace="drf")),
     url(r"^$", IndexView.as_view(), name="index"),
 
     url(r"^requests/$", RequestListView.as_view(), name="request-list"),

diff --git a/pinder/users/models.py b/pinder/users/models.py
@@ -20,7 +20,7 @@ class User(AbstractBaseUser, PermissionsMixin):
 
     name = models.CharField(max_length=128)
     email = models.EmailField(unique=True)
-    isp = models.ForeignKey(Isp)
+    isp = models.ForeignKey(Isp, on_delete=models.CASCADE)
 
     is_staff = models.BooleanField(
         "Staff status",

diff --git a/pinder/users/views.py b/pinder/users/views.py
@@ -1,5 +1,5 @@
 from django.contrib.auth import login
-from django.core.urlresolvers import reverse
+from django.urls import reverse
 from django.views.generic import RedirectView
 
 from rest_framework.permissions import AllowAny