Merge 383cbc5 into af5b072

django_blog_it/django_blog_it/migrations/0001_initial.py

@@ -21,7 +21,7 @@ class Migration(migrations.Migration):
                 ('slug', models.CharField(unique=True, max_length=20)),
                 ('description', models.CharField(max_length=500)),
                 ('is_active', models.BooleanField(default=False)),
-                ('user', models.ForeignKey(to=settings.AUTH_USER_MODEL)),
+                ('user', models.ForeignKey(to=settings.AUTH_USER_MODEL, on_delete=models.CASCADE)),
             ],
         ),
         migrations.CreateModel(
@@ -46,8 +46,8 @@ class Migration(migrations.Migration):
                 ('tags', models.TextField(null=True, blank=True)),
                 ('status', models.CharField(default=b'Drafted', max_length=10, choices=[(b'Drafted', b'Drafted'), (b'Published', b'Published'), (b'Rejected', b'Rejected')])),
                 ('keywords', models.TextField(max_length=500, blank=True)),
-                ('category', models.ForeignKey(to='django_blog_it.Category')),
-                ('user', models.ForeignKey(to=settings.AUTH_USER_MODEL)),
+                ('category', models.ForeignKey(to='django_blog_it.Category', on_delete=models.CASCADE)),
+                ('user', models.ForeignKey(to=settings.AUTH_USER_MODEL, on_delete=models.CASCADE)),
             ],
         ),
         migrations.CreateModel(

django_blog_it/django_blog_it/migrations/0004_posthistory.py

@@ -19,8 +19,8 @@ class Migration(migrations.Migration):
                 ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)),
                 ('content', models.CharField(max_length=200)),
                 ('created_at', models.DateTimeField(auto_now_add=True)),
-                ('post', models.ForeignKey(related_name='history', to='django_blog_it.Post')),
-                ('user', models.ForeignKey(to=settings.AUTH_USER_MODEL)),
+                ('post', models.ForeignKey(related_name='history', to='django_blog_it.Post', on_delete=models.CASCADE)),
+                ('user', models.ForeignKey(to=settings.AUTH_USER_MODEL, on_delete=models.CASCADE)),
             ],
         ),
     ]

django_blog_it/django_blog_it/migrations/0015_auto_20180304_1059.py

@@ -0,0 +1,29 @@
+# Generated by Django 2.0.2 on 2018-03-04 10:59
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('django_blog_it', '0014_post_slugs'),
+    ]
+
+    operations = [
+        migrations.AlterModelOptions(
+            name='category',
+            options={'ordering': ['-id']},
+        ),
+        migrations.AlterModelOptions(
+            name='page',
+            options={'ordering': ['-id']},
+        ),
+        migrations.AlterModelOptions(
+            name='post',
+            options={'ordering': ['-updated_on']},
+        ),
+        migrations.AlterModelOptions(
+            name='userrole',
+            options={'ordering': ['-id']},
+        ),
+    ]

django_blog_it/django_blog_it/models.py

@@ -22,7 +22,7 @@
 
 
 class UserRole(models.Model):
-    user = models.ForeignKey(settings.AUTH_USER_MODEL)
+    user = models.ForeignKey(settings.AUTH_USER_MODEL, on_delete=models.CASCADE)
     role = models.CharField(max_length=10, choices=STATUS_CHOICE)
     class Meta:
         ordering = ['-id']
@@ -48,7 +48,7 @@ class Category(models.Model):
     is_active = models.BooleanField(default=False)
     meta_description = models.TextField(max_length=160, null=True, blank=True)
     meta_keywords = models.TextField(max_length=255, null=True, blank=True)
-    user = models.ForeignKey(settings.AUTH_USER_MODEL)
+    user = models.ForeignKey(settings.AUTH_USER_MODEL, on_delete=models.CASCADE)
 
     class Meta:
         ordering = ['-id']
@@ -99,9 +99,9 @@ class Post(models.Model):
     created_on = models.DateTimeField(auto_now_add=True)
     updated_on = models.DateField(auto_now=True)
     meta_description = models.TextField(max_length=160, null=True, blank=True)
-    user = models.ForeignKey(settings.AUTH_USER_MODEL)
+    user = models.ForeignKey(settings.AUTH_USER_MODEL, on_delete=models.CASCADE)
     content = models.TextField()
-    category = models.ForeignKey(Category)
+    category = models.ForeignKey(Category, on_delete=models.CASCADE)
     tags = models.ManyToManyField(Tags, related_name='rel_posts')
     status = models.CharField(max_length=10, choices=STATUS_CHOICE, default='Drafted')
     keywords = models.TextField(max_length=500, blank=True)
@@ -182,7 +182,7 @@ def create_slug(tempslug):
 
 
 class Post_Slugs(models.Model):
-    blog = models.ForeignKey(Post, related_name='slugs')
+    blog = models.ForeignKey(Post, related_name='slugs', on_delete=models.CASCADE)
     slug = models.SlugField(max_length=100, unique=True)
     is_active = models.BooleanField(default=False)
 
@@ -191,8 +191,8 @@ def __str__(self):
 
 
 class PostHistory(models.Model):
-    user = models.ForeignKey(settings.AUTH_USER_MODEL)
-    post = models.ForeignKey(Post, related_name='history')
+    user = models.ForeignKey(settings.AUTH_USER_MODEL, on_delete=models.CASCADE)
+    post = models.ForeignKey(Post, related_name='history', on_delete=models.CASCADE)
     content = models.CharField(max_length=200)
     created_at = models.DateTimeField(auto_now_add=True)
 
@@ -242,7 +242,7 @@ def __str__(self):
 
 
 class Menu(models.Model):
-    parent = models.ForeignKey('self', blank=True, null=True)
+    parent = models.ForeignKey('self', blank=True, null=True, on_delete=models.CASCADE)
     title = models.CharField(max_length=255)
     url = models.URLField(max_length=255, blank=True)
     status = models.BooleanField(default=True)
@@ -270,7 +270,7 @@ class ContactUsSettings(models.Model):
 
 
 class Google(models.Model):
-    user = models.ForeignKey(settings.AUTH_USER_MODEL, related_name='google')
+    user = models.ForeignKey(settings.AUTH_USER_MODEL, related_name='google', on_delete=models.CASCADE)
     google_id = models.CharField(max_length=200, default='')
     google_url = models.CharField(max_length=1000, default='')
     verified_email = models.CharField(max_length=200, default='')
@@ -287,7 +287,7 @@ def __str__(self):
 
 
 class Facebook(models.Model):
-    user = models.ForeignKey(settings.AUTH_USER_MODEL, related_name='facebook')
+    user = models.ForeignKey(settings.AUTH_USER_MODEL, related_name='facebook', on_delete=models.CASCADE)
     facebook_id = models.CharField(max_length=100)
     facebook_url = models.CharField(max_length=200, default='')
     first_name = models.CharField(max_length=200, default='')

django_blog_it/django_blog_it/templatetags/blog_tags.py

@@ -8,7 +8,7 @@
 register = template.Library()
 
 
-@register.assignment_tag(takes_context=True)
+@register.simple_tag(takes_context=True)
 def get_archives(context):
     archives = []
     dates = []
@@ -75,7 +75,7 @@ def user_published_posts(user):
                                ).count()
 
 
-@register.assignment_tag
+@register.simple_tag
 def blog_title():
     return settings.BLOG_TITLE
 
@@ -85,6 +85,6 @@ def category_posts(category):
     return Post.objects.filter(category=category).count()
 
 
-@register.assignment_tag
+@register.simple_tag
 def google_analytics_id():
     return os.getenv("GOOGLE_ANALYTICS_ID")

django_blog_it/django_blog_it/views.py

@@ -26,7 +26,7 @@
 except ImportError:
     from django.contrib.auth.models import User
 from django.contrib.auth.mixins import LoginRequiredMixin
-from django.core.urlresolvers import reverse, reverse_lazy
+from django.urls import reverse, reverse_lazy
 from django.views.generic import ListView, DetailView, CreateView, DeleteView,\
     UpdateView, FormView, TemplateView, View
 from django.views.generic.edit import ProcessFormView

django_blog_it/docs/source/conf.py

@@ -51,9 +51,9 @@
 # built documents.
 #
 # The short X.Y version.
-version = '0.2.4'
+version = '0.3'
 # The full version, including alpha/beta/rc tags.
-release = '0.2.4'
+release = '0.3'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.

django_blog_it/posts/views.py

@@ -13,7 +13,7 @@
 from django.template import Context
 from django.views.generic import ListView, DetailView
 from django.shortcuts import render_to_response
-from django.core.urlresolvers import reverse
+from django.urls import reverse
 from microurl import google_mini
 from django_blog_it.django_blog_it.models import ContactUsSettings, Post_Slugs
 

setup.py

@@ -22,7 +22,7 @@
 
 setup(
     name='django-blog-it',
-    version='0.2.4',
+    version='0.3',
     packages=find_packages(exclude=['tests', 'tests.*']),
     include_package_data=True,
     description='A simple installable app for writing blog posts',