diff --git a/todo/__init__.py b/todo/__init__.py index debe07b..e69de29 100644 --- a/todo/__init__.py +++ b/todo/__init__.py @@ -1,10 +0,0 @@ -""" -A multi-user, multi-group task management and assignment system for Django. -""" -__version__ = '1.6' - -__author__ = 'Scot Hacker' -__email__ = 'shacker@birdhouse.org' - -__url__ = 'https://github.com/shacker/django-todo' -__license__ = 'BSD License' diff --git a/todo/forms.py b/todo/forms.py index ee56d6e..77b7657 100644 --- a/todo/forms.py +++ b/todo/forms.py @@ -2,6 +2,8 @@ from django import forms from django.forms import ModelForm from django.contrib.auth.models import Group from todo.models import Item, List +from django.contrib.auth import get_user_model + class AddListForm(ModelForm): diff --git a/todo/models.py b/todo/models.py index 0c5dc53..345829d 100644 --- a/todo/models.py +++ b/todo/models.py @@ -9,6 +9,7 @@ from django.utils.encoding import python_2_unicode_compatible from django.conf import settings + @python_2_unicode_compatible class List(models.Model): name = models.CharField(max_length=60) diff --git a/todo/templates/todo/view_list.html b/todo/templates/todo/view_list.html index 535643a..1a27d38 100644 --- a/todo/templates/todo/view_list.html +++ b/todo/templates/todo/view_list.html @@ -112,13 +112,13 @@ {% if list_slug == "mine" %} {{ task.list }} {% endif %} - + {% endfor %}

-

View completed tasks

+

View completed tasks

{% else %} @@ -153,7 +153,7 @@

-

View incomplete tasks

+

View incomplete tasks

{% endif %} {% if user.is_staff %} diff --git a/todo/views.py b/todo/views.py index d10d4e3..76a28fd 100644 --- a/todo/views.py +++ b/todo/views.py @@ -14,7 +14,7 @@ from django.template.loader import render_to_string from django.views.decorators.csrf import csrf_exempt from django.contrib.sites.models import Site -from todo import settings +from todo import settings from todo.forms import AddListForm, AddItemForm, EditItemForm, AddExternalItemForm, SearchForm from todo.models import Item, List, Comment from todo.utils import mark_done, undo_completed_task, del_tasks, send_notify_mail diff --git a/todo/werid_folder/py.py b/todo/werid_folder/py.py new file mode 100644 index 0000000..debe07b --- /dev/null +++ b/todo/werid_folder/py.py @@ -0,0 +1,10 @@ +""" +A multi-user, multi-group task management and assignment system for Django. +""" +__version__ = '1.6' + +__author__ = 'Scot Hacker' +__email__ = 'shacker@birdhouse.org' + +__url__ = 'https://github.com/shacker/django-todo' +__license__ = 'BSD License' diff --git a/todo/werid_folder/weird.py b/todo/werid_folder/weird.py new file mode 100644 index 0000000..e69de29