Merge branch 'epilys-master'

This commit is contained in:
Scot Hacker 2017-04-13 00:17:32 -07:00
commit 780958cb8b
3 changed files with 4 additions and 9 deletions

View file

@ -99,6 +99,7 @@ setup(
include_package_data=True, include_package_data=True,
zip_safe=False, zip_safe=False,
tests_require=['tox'], tests_require=['tox'],
install_requires=['django-autoslug', 'unidecode', ],
cmdclass={ cmdclass={
'clean': Clean, 'clean': Clean,
'test': Tox, 'test': Tox,

View file

@ -3,24 +3,18 @@ import datetime
from django.db import models from django.db import models
from django.contrib.auth.models import Group from django.contrib.auth.models import Group
from django.template.defaultfilters import slugify
from django.core.urlresolvers import reverse from django.core.urlresolvers import reverse
from django.utils.encoding import python_2_unicode_compatible from django.utils.encoding import python_2_unicode_compatible
from django.conf import settings from django.conf import settings
from autoslug import AutoSlugField
@python_2_unicode_compatible @python_2_unicode_compatible
class List(models.Model): class List(models.Model):
name = models.CharField(max_length=60) name = models.CharField(max_length=60)
slug = models.SlugField(max_length=60, editable=False) slug = AutoSlugField(populate_from='name', editable=False, always_update=True)
group = models.ForeignKey(Group) group = models.ForeignKey(Group)
def save(self, *args, **kwargs):
if not self.id:
self.slug = slugify(self.name)
super(List, self).save(*args, **kwargs)
def __str__(self): def __str__(self):
return self.name return self.name

View file

@ -71,7 +71,7 @@ def del_list(request, list_id, list_slug):
if request.method == 'POST': if request.method == 'POST':
List.objects.get(id=list.id).delete() List.objects.get(id=list.id).delete()
messages.success(request, "{list_name} is gone.".format(list_name=del_list.name)) messages.success(request, "{list_name} is gone.".format(list_name=list.name))
return HttpResponseRedirect(reverse('todo-lists')) return HttpResponseRedirect(reverse('todo-lists'))
else: else:
item_count_done = Item.objects.filter(list=list.id, completed=1).count() item_count_done = Item.objects.filter(list=list.id, completed=1).count()