PEP8 cleanups

This commit is contained in:
Roberto Rosario
2012-01-18 14:37:15 -04:00
parent ad59734460
commit 970cb74d35
62 changed files with 365 additions and 379 deletions

View File

@@ -32,7 +32,7 @@ class FolderListForm(forms.Form):
Permission.objects.check_permissions(user, [PERMISSION_FOLDER_VIEW])
except PermissionDenied:
queryset = AccessEntry.objects.filter_objects_by_access(PERMISSION_FOLDER_VIEW, user, queryset)
self.fields['folder'] = forms.ModelChoiceField(
queryset=queryset,
label=_(u'Folder'))

View File

@@ -27,11 +27,11 @@ class Folder(models.Model):
@property
def documents(self):
return [folder_document.document for folder_document in self.folderdocument_set.all()]
def remove_document(self, document):
folder_document = self.folderdocument_set.get(document=document)
folder_document.delete()
def add_document(self, document):
folder_document, created = FolderDocument.objects.get_or_create(folder=self, document=document)
return created

View File

@@ -1,4 +1,4 @@
from __future__ import absolute_import
from __future__ import absolute_import
from django.utils.translation import ugettext_lazy as _

View File

@@ -20,4 +20,3 @@ Another way to test that 1 + 1 is equal to 2.
>>> 1 + 1 == 2
True
"""}

View File

@@ -11,6 +11,6 @@ urlpatterns = patterns('folders.views',
url(r'^document/(?P<document_id>\d+)/folder/add/$', 'folder_add_document', (), 'folder_add_document'),
url(r'^document/(?P<document_id>\d+)/folder/list/$', 'document_folder_list', (), 'document_folder_list'),
url(r'^(?P<folder_pk>\d+)/acl/list/$', 'folder_acl_list', (), 'folder_acl_list'),
)

View File

@@ -1,4 +1,4 @@
from __future__ import absolute_import
from __future__ import absolute_import
import logging
@@ -49,8 +49,8 @@ def folder_list(request, queryset=None, extra_context=None):
queryset = AccessEntry.objects.filter_objects_by_access(PERMISSION_FOLDER_VIEW, request.user, queryset)
context['object_list'] = queryset
return render_to_response('generic_list.html',
return render_to_response('generic_list.html',
context,
context_instance=RequestContext(request)
)
@@ -58,7 +58,7 @@ def folder_list(request, queryset=None, extra_context=None):
def folder_create(request):
Permission.objects.check_permissions(request.user, [PERMISSION_FOLDER_CREATE])
if request.method == 'POST':
form = FolderForm(request.POST)
if form.is_valid():
@@ -157,9 +157,9 @@ def folder_view(request, folder_id):
'hide_links': True,
'multi_select_as_buttons': True,
'object': folder,
'object_name': _(u'folder'),
'object_name': _(u'folder'),
}
return document_list(
request,
object_list=folder.documents,
@@ -193,14 +193,13 @@ def folder_add_document(request, document_id):
else:
form = FolderListForm(user=request.user)
return render_to_response('generic_form.html', {
'title': _(u'add document "%s" to a folder') % document,
'form': form,
'object': document,
'next': next,
},
context_instance=RequestContext(request))
context_instance=RequestContext(request))
def document_folder_list(request, document_id):