Changes for django 2.2

[sommitrealweird.git] / sommitrealweird / bpcms / models.py

diff --git a/sommitrealweird/bpcms/models.py b/sommitrealweird/bpcms/models.py
index 38f18ffe47b400d68327ebcf73535d3fbb0130cd..5c49f49b91f4f6b706af653d7def5c480fb2cda6 100644 (file)
--- a/sommitrealweird/bpcms/models.py
+++ b/sommitrealweird/bpcms/models.py
@@ -2,7 +2,7 @@ from django.db import models
 from django.conf import settings
 from django.contrib import admin
 from django.core.cache import cache
 from django.conf import settings
 from django.contrib import admin
 from django.core.cache import cache

-from django.core.urlresolvers import reverse
+from django.urls import reverse

 
 FORMAT_CHOICES = (
         ('rst', 'reStructuredText'),
 
 FORMAT_CHOICES = (
         ('rst', 'reStructuredText'),


@@ -23,8 +23,8 @@ class CSSDocument(models.Model):
 class Document(models.Model):
     title = models.CharField(max_length=150)
     islive = models.BooleanField(default=False)
 class Document(models.Model):
     title = models.CharField(max_length=150)
     islive = models.BooleanField(default=False)

-    extracss = models.ManyToManyField(CSSDocument, null=True, blank=True)
-    folder = models.ForeignKey('Folder', null=True, blank=True)
+    extracss = models.ManyToManyField(CSSDocument, blank=True)
+    folder = models.ForeignKey('Folder', on_delete=models.SET_NULL, null=True, blank=True)

     format = models.CharField(max_length=10, choices=FORMAT_CHOICES)
     slug = models.SlugField()
     content = models.TextField()
     format = models.CharField(max_length=10, choices=FORMAT_CHOICES)
     slug = models.SlugField()
     content = models.TextField()


@@ -66,19 +66,19 @@ class Document(models.Model):
     def get_absolute_url(self):
         if self.slug == 'index':
             if self.folder.parent:
     def get_absolute_url(self):
         if self.slug == 'index':
             if self.folder.parent:

-                return reverse('bpcms.views.document_view', kwargs={'folders': self.folder.parent.get_path(), 'slug': self.folder.slug})
+                return reverse('bpcms-document-view', kwargs={'folders': self.folder.parent.get_path(), 'slug': self.folder.slug})

             else:
             else:

-                return reverse('bpcms.views.document_view', kwargs={'slug': self.folder.slug})
+                return reverse('bpcms-document-view', kwargs={'slug': self.folder.slug})

         else:
             if self.folder:
         else:
             if self.folder:

-                return reverse('bpcms.views.document_view', kwargs={'folders': self.get_folder_path(), 'slug': self.slug})
+                return reverse('bpcms-document-view', kwargs={'folders': self.get_folder_path(), 'slug': self.slug})

             else:
             else:

-                return reverse('bpcms.views.document_view', kwargs={'slug': self.slug})
+                return reverse('bpcms-document-view', kwargs={'slug': self.slug})

 
 class Folder(models.Model):
     title = models.CharField(max_length=150)
     slug = models.SlugField()
 
 class Folder(models.Model):
     title = models.CharField(max_length=150)
     slug = models.SlugField()

-    parent = models.ForeignKey('self', null=True, blank=True)
+    parent = models.ForeignKey('self', on_delete=models.SET_NULL, null=True, blank=True)

 
     def __str__(self):
         return self.__unicode__()
 
     def __str__(self):
         return self.__unicode__()


@@ -106,6 +106,6 @@ class Folder(models.Model):
 
     def get_absolute_url(self):
         if self.parent:
 
     def get_absolute_url(self):
         if self.parent:

-            return reverse('bpcms.views.document_view', kwargs={'folders': self.parent.get_path(), 'slug': self.slug})
+            return reverse('bpcms-document-view', kwargs={'folders': self.parent.get_path(), 'slug': self.slug})

         else:
         else:

-            return reverse('bpcms.views.document_view', kwargs={'slug': self.slug})
+            return reverse('bpcms-document-view', kwargs={'slug': self.slug})