# HG changeset patch # User Peter Sanchez # Date 1512754418 28800 # Fri Dec 08 09:33:38 2017 -0800 # Node ID 0bb27be9f2a1c525c38784f0922cfcc76b412a69 # Parent 2a413f47ed2468caa81254c8ba64c0292afb713a # Parent 3d2a31db7abca115726bc0f8770882441f7a3f22 Merging in 2.0 dev diff --git a/webutils/baseacct/models.py b/webutils/baseacct/models.py --- a/webutils/baseacct/models.py +++ b/webutils/baseacct/models.py @@ -71,8 +71,9 @@ verbose_name=_('User Account'), help_text=_('User Profiles must be "tied" to a user account.'), related_name='%(app_label)s_%(class)s_set', + on_delete=models.CASCADE, ) - + # Activation Key activation_key = models.CharField( max_length=125, diff --git a/webutils/djtools/middleware.py b/webutils/djtools/middleware.py --- a/webutils/djtools/middleware.py +++ b/webutils/djtools/middleware.py @@ -1,7 +1,8 @@ from django.conf import settings +from django.utils.deprecation import MiddlewareMixin -class AddIPAddress(object): +class AddIPAddress(MiddlewareMixin): def process_request(self, request): request.ip_address = self.get_real_ip(request.META) return None