diff options
| -rw-r--r-- | main/models.py | 4 | ||||
| -rw-r--r-- | todolists/models.py | 2 | ||||
| -rw-r--r-- | todolists/views.py | 2 |
3 files changed, 5 insertions, 3 deletions
diff --git a/main/models.py b/main/models.py index 39bc555e..7155d360 100644 --- a/main/models.py +++ b/main/models.py @@ -270,7 +270,8 @@ class Package(models.Model): """ deps = [] arches = None - # TODO: we can use list comprehension and an 'in' query to make this more effective + # TODO: we can use list comprehension and an 'in' query to make this + # more effective for dep in self.depends.all(): pkg = dep.get_best_satisfier(self) providers = None @@ -279,6 +280,7 @@ class Package(models.Model): deps.append({'dep': dep, 'pkg': pkg, 'providers': providers}) # sort the list; deptype sorting makes this tricker than expected sort_order = {'D': 0, 'O': 1, 'M': 2, 'C': 3} + def sort_key(val): dep = val['dep'] return (sort_order.get(dep.deptype, 1000), dep.name) diff --git a/todolists/models.py b/todolists/models.py index e02cdd1a..156b041d 100644 --- a/todolists/models.py +++ b/todolists/models.py @@ -73,7 +73,7 @@ class TodolistPackage(models.Model): comments = models.TextField(null=True, blank=True) class Meta: - unique_together = (('todolist','pkgname', 'arch'),) + unique_together = (('todolist', 'pkgname', 'arch'),) get_latest_by = 'created' def __unicode__(self): diff --git a/todolists/views.py b/todolists/views.py index 788d74f2..113b27e7 100644 --- a/todolists/views.py +++ b/todolists/views.py @@ -123,7 +123,7 @@ def edit(request, slug): return redirect(todo_list) else: form = TodoListForm(instance=todo_list, - initial={ 'packages': todo_list.raw }) + initial={'packages': todo_list.raw}) page_dict = { 'title': 'Edit Todo List: %s' % todo_list.name, |