Todo list minor fixes and comments for later
When we show the edit todo list page, use a sorted list retrieved straight from the database instead of a unordered set() we create at the application level. Also add some comments for potential later improvements on transaction boundaries and async emailing. Signed-off-by: Dan McGee <dan@archlinux.org>
This commit is contained in:
parent
5e509529f0
commit
0e58a2e49f
@ -307,7 +307,8 @@ def packages(self):
|
|||||||
|
|
||||||
@property
|
@property
|
||||||
def package_names(self):
|
def package_names(self):
|
||||||
return '\n'.join(set([p.pkg.pkgname for p in self.packages]))
|
# depends on packages property returning a queryset
|
||||||
|
return self.packages.values_list('pkg__pkgname', flat=True).distinct()
|
||||||
|
|
||||||
class Meta:
|
class Meta:
|
||||||
db_table = 'todolists'
|
db_table = 'todolists'
|
||||||
|
@ -68,6 +68,7 @@ def list(request):
|
|||||||
|
|
||||||
return direct_to_template(request, 'todolists/list.html', {'lists': lists})
|
return direct_to_template(request, 'todolists/list.html', {'lists': lists})
|
||||||
|
|
||||||
|
# TODO: this calls for transaction management and async emailing
|
||||||
@permission_required('main.add_todolist')
|
@permission_required('main.add_todolist')
|
||||||
@never_cache
|
@never_cache
|
||||||
def add(request):
|
def add(request):
|
||||||
@ -80,7 +81,7 @@ def add(request):
|
|||||||
description = form.cleaned_data['description'])
|
description = form.cleaned_data['description'])
|
||||||
|
|
||||||
for pkg in form.cleaned_data['packages']:
|
for pkg in form.cleaned_data['packages']:
|
||||||
tpkg = TodolistPkg.objects.create(list = todo, pkg = pkg)
|
tpkg = TodolistPkg.objects.create(list=todo, pkg=pkg)
|
||||||
send_todolist_email(tpkg)
|
send_todolist_email(tpkg)
|
||||||
|
|
||||||
return redirect('/todo/')
|
return redirect('/todo/')
|
||||||
@ -91,9 +92,10 @@ def add(request):
|
|||||||
'title': 'Add Todo List',
|
'title': 'Add Todo List',
|
||||||
'form': form,
|
'form': form,
|
||||||
'submit_text': 'Create List'
|
'submit_text': 'Create List'
|
||||||
}
|
}
|
||||||
return direct_to_template(request, 'general_form.html', page_dict)
|
return direct_to_template(request, 'general_form.html', page_dict)
|
||||||
|
|
||||||
|
# TODO: this calls for transaction management and async emailing
|
||||||
@permission_required('main.change_todolist')
|
@permission_required('main.change_todolist')
|
||||||
@never_cache
|
@never_cache
|
||||||
def edit(request, list_id):
|
def edit(request, list_id):
|
||||||
@ -116,7 +118,7 @@ def edit(request, list_id):
|
|||||||
for pkg in form.cleaned_data['packages']:
|
for pkg in form.cleaned_data['packages']:
|
||||||
if pkg not in packages:
|
if pkg not in packages:
|
||||||
tpkg = TodolistPkg.objects.create(
|
tpkg = TodolistPkg.objects.create(
|
||||||
list = todo_list, pkg = pkg)
|
list=todo_list, pkg=pkg)
|
||||||
send_todolist_email(tpkg)
|
send_todolist_email(tpkg)
|
||||||
|
|
||||||
return redirect(todo_list)
|
return redirect(todo_list)
|
||||||
@ -124,13 +126,13 @@ def edit(request, list_id):
|
|||||||
form = TodoListForm(initial={
|
form = TodoListForm(initial={
|
||||||
'name': todo_list.name,
|
'name': todo_list.name,
|
||||||
'description': todo_list.description,
|
'description': todo_list.description,
|
||||||
'packages': todo_list.package_names,
|
'packages': '\n'.join(todo_list.package_names),
|
||||||
})
|
})
|
||||||
page_dict = {
|
page_dict = {
|
||||||
'title': 'Edit Todo List: %s' % todo_list.name,
|
'title': 'Edit Todo List: %s' % todo_list.name,
|
||||||
'form': form,
|
'form': form,
|
||||||
'submit_text': 'Save List'
|
'submit_text': 'Save List'
|
||||||
}
|
}
|
||||||
return direct_to_template(request, 'general_form.html', page_dict)
|
return direct_to_template(request, 'general_form.html', page_dict)
|
||||||
|
|
||||||
@permission_required('main.delete_todolist')
|
@permission_required('main.delete_todolist')
|
||||||
|
Loading…
Reference in New Issue
Block a user