Fix deprecation warnings for Django 1.11 and Django 2.0.

Signed-off-by: Roberto Rosario <roberto.rosario.gonzalez@gmail.com>
This commit is contained in:
Roberto Rosario
2017-07-21 00:25:18 -04:00
parent 42a762481b
commit f09321f6ab
81 changed files with 173 additions and 135 deletions
+1 -1
View File
@@ -5,8 +5,8 @@ from datetime import timedelta
from kombu import Exchange, Queue
from django.apps import apps
from django.core.urlresolvers import reverse_lazy
from django.db.models.signals import pre_save
from django.urls import reverse_lazy
from django.utils.translation import ugettext_lazy as _
from acls import ModelPermission
+11 -4
View File
@@ -4,8 +4,8 @@ import logging
from django.conf import settings
from django.core.exceptions import ValidationError
from django.core.urlresolvers import reverse
from django.db import models
from django.urls import reverse
from django.utils.encoding import force_text, python_2_unicode_compatible
from django.utils.timezone import now
from django.utils.translation import ugettext_lazy as _
@@ -24,7 +24,9 @@ class DocumentCheckout(models.Model):
"""
Model to store the state and information of a document checkout
"""
document = models.OneToOneField(Document, verbose_name=_('Document'))
document = models.OneToOneField(
Document, on_delete=models.CASCADE, verbose_name=_('Document')
)
checkout_datetime = models.DateTimeField(
auto_now_add=True, verbose_name=_('Check out date and time')
)
@@ -34,7 +36,10 @@ class DocumentCheckout(models.Model):
),
verbose_name=_('Check out expiration date and time')
)
user = models.ForeignKey(settings.AUTH_USER_MODEL, verbose_name=_('User'))
user = models.ForeignKey(
settings.AUTH_USER_MODEL, on_delete=models.CASCADE,
verbose_name=_('User')
)
block_new_version = models.BooleanField(
default=True,
help_text=_(
@@ -89,7 +94,9 @@ class DocumentCheckout(models.Model):
class NewVersionBlock(models.Model):
document = models.ForeignKey(Document, verbose_name=_('Document'))
document = models.ForeignKey(
Document, on_delete=models.CASCADE, verbose_name=_('Document')
)
objects = NewVersionBlockManager()
+1 -1
View File
@@ -1,9 +1,9 @@
from __future__ import absolute_import, unicode_literals
from django.contrib import messages
from django.core.urlresolvers import reverse
from django.http import HttpResponseRedirect
from django.shortcuts import get_object_or_404
from django.urls import reverse
from django.utils.translation import ugettext_lazy as _
from documents.models import Document