Moved models around

2 files changed, 2 insertions, 36 deletions

diff --git a/todolists/models.py b/todolists/models.py
deleted file mode 100644
index ec24d5e..0000000
--- a/todolists/models.py
+++ /dev/null
@@ -1,33 +0,0 @@
-from django.db import models
-from django.contrib.auth.models import User
-from archweb_dev.packages.models import Package
-
-class TodolistManager(models.Manager):
-    def get_incomplete(self):
-        results = []
-        for l in self.all().order_by('-date_added'):
-            if TodolistPkg.objects.filter(list=l.id).filter(complete=False).count() > 0:
-                results.append(l)
-        return results
-
-class Todolist(models.Model):
-    id = models.AutoField(primary_key=True)
-    creator = models.ForeignKey(User)
-    name = models.CharField(maxlength=255)
-    description = models.TextField()
-    date_added = models.DateField(auto_now_add=True)
-    objects = TodolistManager()
-    class Meta:
-        db_table = 'todolists'
-
-class TodolistPkg(models.Model):
-    id = models.AutoField(primary_key=True)
-    list = models.ForeignKey(Todolist)
-    pkg = models.ForeignKey(Package)
-    complete = models.BooleanField(default=False)
-    class Meta:
-        db_table = 'todolists_pkgs'
-        unique_together = (('list','pkg'),)
-
-# vim: set ts=4 sw=4 et:
-
diff --git a/todolists/views.py b/todolists/views.py
index cce92a6..59dc5db 100644
--- a/todolists/views.py
+++ b/todolists/views.py
@@ -2,9 +2,8 @@ from django.http import HttpResponse, HttpResponseRedirect
 from django.shortcuts import get_object_or_404
 from django.contrib.auth.decorators import login_required, user_passes_test
 from django.contrib.auth.models import User
-from archweb_dev.lib.utils import render_response
-from archweb_dev.todolists.models import Todolist, TodolistPkg
-from archweb_dev.packages.models import Package
+from archweb_dev.main.utils import render_response
+from archweb_dev.main.models import Todolist, TodolistPkg, Package
 
 # FIXME: ugly hackery. http://code.djangoproject.com/ticket/3450
 import django.db