Merge pull request #163 from cavanierc/Django2

Support for Django 2
This commit is contained in:
Grant McConnaughey 2017-12-17 10:09:09 -06:00 committed by GitHub
commit d9c162cda9
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 3 additions and 3 deletions

View file

@ -22,7 +22,7 @@ class Migration(migrations.Migration):
('primary', models.BooleanField(default=False)),
('avatar', models.ImageField(storage=django.core.files.storage.FileSystemStorage(), max_length=1024, upload_to=avatar.models.avatar_file_path, blank=True)),
('date_uploaded', models.DateTimeField(default=django.utils.timezone.now)),
('user', models.ForeignKey(to=settings.AUTH_USER_MODEL)),
('user', models.ForeignKey(to=settings.AUTH_USER_MODEL, on_delete=models.CASCADE)),
],
),
]

View file

@ -90,7 +90,7 @@ class AvatarField(models.ImageField):
class Avatar(models.Model):
user = models.ForeignKey(
getattr(settings, 'AUTH_USER_MODEL', 'auth.User'),
verbose_name=_("user"),
verbose_name=_("user"), on_delete=models.CASCADE,
)
primary = models.BooleanField(
verbose_name=_("primary"),

View file

@ -1,5 +1,5 @@
from django import template
from django.core.urlresolvers import reverse
from django.urls import reverse
from django.template.loader import render_to_string
from django.utils import six
from django.utils.translation import ugettext as _