matthias/mayan-edms
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Cleaned up files, removed ununsed imports

Browse Source
This commit is contained in:
Roberto Rosario
2011-05-20 00:54:11 -04:00
parent 17c749a80a
commit 4a4afbf06a
22 changed files with 74 additions and 128 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
apps/documents/forms.py
View File

@@ -298,13 +298,13 @@ class DocumentCreateWizard(BoundFormWizard):
self.initial = {2: initial_data}
if not initial_data:
# If there is no metadata selected end wizard
self.form_list=[DocumentTypeSelectForm, MetadataSelectionForm]
self.form_list = [DocumentTypeSelectForm, MetadataSelectionForm]
if isinstance(form, MetadataFormSet):
for identifier, metadata in enumerate(form.cleaned_data):
self.query_dict['metadata%s_id' % identifier] = metadata['id']
self.query_dict['metadata%s_value' % identifier] = metadata['value']
def get_template(self, step):
return 'generic_wizard.html'
@@ -313,10 +313,10 @@ class DocumentCreateWizard(BoundFormWizard):
view = 'upload_document_multiple'
else:
view = 'upload_document'
if self.document_type:
self.query_dict['document_type_id'] = self.document_type.pk
url = urlquote(reverse(view), self.query_dict)
return HttpResponseRedirect(url)

2
apps/documents/statistics.py
View File

@@ -60,7 +60,7 @@ def get_statistics():
]
)
#[(day_count['date_added'].strftime('%Y-%m-%d'), day_count['id__count']) for day_count in Document.objects.values('date_added').annotate(Count("id"))]
return {
'title': _(u'Document statistics'),
'paragraphs': paragraphs

16
apps/documents/views.py
View File

@@ -105,7 +105,7 @@ def document_create_sibling(request, document_id, multiple=True):
if document.document_type_id:
query_dict['document_type_id'] = document.document_type_id
url = reverse(view)
return HttpResponseRedirect('%s?%s' % (url, urlencode(query_dict)))
@@ -126,7 +126,7 @@ def _handle_save_document(request, document, form=None):
warnings = update_indexes(document)
if request.user.is_staff or request.user.is_superuser:
for warning in warnings:
messages.warning(request, warning)
messages.warning(request, warning)
def _handle_zip_file(request, uploaded_file, document_type):
@@ -150,13 +150,13 @@ def _handle_zip_file(request, uploaded_file, document_type):
def upload_document_with_type(request, multiple=True):
check_permissions(request.user, 'documents', [PERMISSION_DOCUMENT_CREATE])
document_type_id = request.GET.get('document_type_id', None)
if document_type_id:
document_type = get_object_or_404(DocumentType, pk=document_type_id)
else:
document_type = None
local_form = DocumentForm(prefix='local', initial={'document_type': document_type})
if USE_STAGING_DIRECTORY:
staging_form = StagingDocumentForm(prefix='staging',
@@ -240,10 +240,10 @@ def upload_document_with_type(request, multiple=True):
'hide_link': True,
}
},
)
)
else:
subtemplates_list.append(local_upload_form)
context = {
'document_type_id': document_type_id,
'subtemplates_list': subtemplates_list,
@@ -280,7 +280,7 @@ def document_view_simple(request, document_id):
'form': preview_form,
'object': document,
}
},
},
)
subtemplates_list.append(
{
@@ -851,7 +851,7 @@ def document_page_view(request, document_page_id):
'object': document_page,
'web_theme_hide_menus': True,
'form': document_page_form,
'title': _(u'details for: %s') % document_page,
'title': _(u'details for: %s') % document_page,
}, context_instance=RequestContext(request))