public/coins-demo
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Use python 2/3 compatible unicode strings

Browse source
This commit is contained in:
Scot Hacker 2014-12-02 10:53:38 -08:00
parent 6e032b22bb
commit a9175d575b
2 changed files with 22 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
todo/admin.py
View file

@ -9,6 +9,10 @@ class ItemAdmin(admin.ModelAdmin):
search_fields = ('name',) search_fields = ('name',)
class CommentAdmin(admin.ModelAdmin):
list_display = ('author', 'date', 'snippet')
admin.site.register(List) admin.site.register(List)
admin.site.register(Comment) admin.site.register(Comment, CommentAdmin)
admin.site.register(Item, ItemAdmin) admin.site.register(Item, ItemAdmin)

27
todo/models.py
View file

@ -1,15 +1,17 @@
from __future__ import unicode_literals
import datetime
from django.db import models from django.db import models
from django.contrib.auth.models import User, Group from django.contrib.auth.models import User, Group
from django.template.defaultfilters import slugify 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
import datetime
@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 = models.SlugField(max_length=60, editable=False)
# slug = models.SlugField(max_length=60)
group = models.ForeignKey(Group) group = models.ForeignKey(Group)
def save(self, *args, **kwargs): def save(self, *args, **kwargs):
@ -18,7 +20,7 @@ class List(models.Model):
super(List, self).save(*args, **kwargs) super(List, self).save(*args, **kwargs)
def __unicode__(self): def __str__(self):
return self.name return self.name
# Custom manager lets us do things like Item.completed_tasks.all() # Custom manager lets us do things like Item.completed_tasks.all()
@ -36,6 +38,7 @@ class List(models.Model):
unique_together = ("group", "slug") unique_together = ("group", "slug")
@python_2_unicode_compatible
class Item(models.Model): class Item(models.Model):
title = models.CharField(max_length=140) title = models.CharField(max_length=140)
list = models.ForeignKey(List) list = models.ForeignKey(List)
@ -54,7 +57,7 @@ class Item(models.Model):
if self.due_date and datetime.date.today() > self.due_date: if self.due_date and datetime.date.today() > self.due_date:
return 1 return 1
def __unicode__(self): def __str__(self):
return self.title return self.title
def get_absolute_url(self): def get_absolute_url(self):
@ -73,6 +76,7 @@ class Item(models.Model):
ordering = ["priority"] ordering = ["priority"]
@python_2_unicode_compatible
class Comment(models.Model): class Comment(models.Model):
""" """
Not using Django's built-in comments because we want to be able to save Not using Django's built-in comments because we want to be able to save
@ -83,8 +87,11 @@ class Comment(models.Model):
date = models.DateTimeField(default=datetime.datetime.now) date = models.DateTimeField(default=datetime.datetime.now)
body = models.TextField(blank=True) body = models.TextField(blank=True)
def __unicode__(self): def snippet(self):
return '%s - %s' % ( # Define here rather than in __str__ so we can use it in the admin list_display
self.author, return "{author} - {snippet}...".format(author=self.author, snippet=self.body[:35])
self.date,
) def __str__(self):
return self.snippet