Refactor the document transformation clear view.
This commit is contained in:
@@ -21,16 +21,15 @@ from .views import (
|
|||||||
DocumentPageRotateRightView, DocumentPageView, DocumentPageViewResetView,
|
DocumentPageRotateRightView, DocumentPageView, DocumentPageViewResetView,
|
||||||
DocumentPageZoomInView, DocumentPageZoomOutView, DocumentPreviewView,
|
DocumentPageZoomInView, DocumentPageZoomOutView, DocumentPreviewView,
|
||||||
DocumentPrint, DocumentRestoreView, DocumentRestoreManyView,
|
DocumentPrint, DocumentRestoreView, DocumentRestoreManyView,
|
||||||
DocumentTrashView, DocumentTrashManyView, DocumentTypeCreateView,
|
DocumentTransformationsClearView, DocumentTrashView, DocumentTrashManyView,
|
||||||
DocumentTypeDeleteView, DocumentTypeDocumentListView,
|
DocumentTypeCreateView, DocumentTypeDeleteView,
|
||||||
DocumentTypeFilenameCreateView, DocumentTypeFilenameDeleteView,
|
DocumentTypeDocumentListView, DocumentTypeFilenameCreateView,
|
||||||
DocumentTypeFilenameEditView, DocumentTypeFilenameListView,
|
DocumentTypeFilenameDeleteView, DocumentTypeFilenameEditView,
|
||||||
DocumentTypeListView, DocumentTypeEditView,
|
DocumentTypeFilenameListView, DocumentTypeListView, DocumentTypeEditView,
|
||||||
DocumentUpdatePageCountView, DocumentVersionDownloadFormView,
|
DocumentUpdatePageCountView, DocumentVersionDownloadFormView,
|
||||||
DocumentVersionDownloadView, DocumentVersionListView,
|
DocumentVersionDownloadView, DocumentVersionListView,
|
||||||
DocumentVersionRevertView, DocumentView, EmptyTrashCanView,
|
DocumentVersionRevertView, DocumentView, EmptyTrashCanView,
|
||||||
RecentDocumentListView, document_clear_transformations,
|
RecentDocumentListView, document_page_navigation_first,
|
||||||
document_multiple_clear_transformations, document_page_navigation_first,
|
|
||||||
document_page_navigation_last, document_page_navigation_next,
|
document_page_navigation_last, document_page_navigation_next,
|
||||||
document_page_navigation_previous
|
document_page_navigation_previous
|
||||||
)
|
)
|
||||||
@@ -122,8 +121,9 @@ urlpatterns = [
|
|||||||
name='document_multiple_download'
|
name='document_multiple_download'
|
||||||
),
|
),
|
||||||
url(
|
url(
|
||||||
r'^(?P<document_id>\d+)/clear_transformations/$',
|
r'^(?P<pk>\d+)/clear_transformations/$',
|
||||||
document_clear_transformations, name='document_clear_transformations'
|
DocumentTransformationsClearView.as_view(),
|
||||||
|
name='document_clear_transformations'
|
||||||
),
|
),
|
||||||
|
|
||||||
url(
|
url(
|
||||||
@@ -151,7 +151,7 @@ urlpatterns = [
|
|||||||
|
|
||||||
url(
|
url(
|
||||||
r'^multiple/clear_transformations/$',
|
r'^multiple/clear_transformations/$',
|
||||||
document_multiple_clear_transformations,
|
DocumentTransformationsClearView.as_view(),
|
||||||
name='document_multiple_clear_transformations'
|
name='document_multiple_clear_transformations'
|
||||||
),
|
),
|
||||||
url(
|
url(
|
||||||
|
|||||||
@@ -2,13 +2,11 @@ from __future__ import absolute_import, unicode_literals
|
|||||||
|
|
||||||
import logging
|
import logging
|
||||||
|
|
||||||
from django.conf import settings
|
|
||||||
from django.contrib import messages
|
from django.contrib import messages
|
||||||
from django.core.exceptions import PermissionDenied
|
from django.core.exceptions import PermissionDenied
|
||||||
from django.core.urlresolvers import reverse, reverse_lazy
|
from django.core.urlresolvers import reverse, reverse_lazy
|
||||||
from django.http import HttpResponseRedirect
|
from django.http import HttpResponseRedirect
|
||||||
from django.shortcuts import render_to_response, get_object_or_404
|
from django.shortcuts import get_object_or_404
|
||||||
from django.template import RequestContext
|
|
||||||
from django.utils.http import urlencode
|
from django.utils.http import urlencode
|
||||||
from django.utils.translation import ugettext_lazy as _, ungettext
|
from django.utils.translation import ugettext_lazy as _, ungettext
|
||||||
|
|
||||||
@@ -550,79 +548,53 @@ class DocumentUpdatePageCountView(MultipleObjectConfirmActionView):
|
|||||||
)
|
)
|
||||||
|
|
||||||
|
|
||||||
def document_clear_transformations(request, document_id=None, document_id_list=None):
|
class DocumentTransformationsClearView(MultipleObjectConfirmActionView):
|
||||||
if document_id:
|
model = Document
|
||||||
documents = Document.objects.filter(pk=document_id)
|
object_permission = permission_transformation_delete
|
||||||
post_redirect = documents[0].get_absolute_url()
|
success_message = _(
|
||||||
elif document_id_list:
|
'Transformation clear request processed for %(count)d document'
|
||||||
documents = Document.objects.filter(pk__in=document_id_list)
|
)
|
||||||
post_redirect = None
|
success_message_plural = _(
|
||||||
|
'Transformation clear request processed for %(count)d documents'
|
||||||
|
)
|
||||||
|
|
||||||
if not documents:
|
def get_extra_context(self):
|
||||||
messages.error(request, _('Must provide at least one document.'))
|
queryset = self.get_queryset()
|
||||||
return HttpResponseRedirect(
|
|
||||||
request.META.get(
|
result = {
|
||||||
'HTTP_REFERER', reverse(settings.LOGIN_REDIRECT_URL)
|
'title': ungettext(
|
||||||
|
'Clear all the page transformations for the selected document?',
|
||||||
|
'Clear all the page transformations for the selected document?',
|
||||||
|
queryset.count()
|
||||||
)
|
)
|
||||||
)
|
}
|
||||||
|
|
||||||
documents = AccessControlList.objects.filter_by_access(
|
if queryset.count() == 1:
|
||||||
permission_transformation_delete, request.user, queryset=documents
|
result.update(
|
||||||
)
|
{
|
||||||
|
'object': queryset.first(),
|
||||||
|
'title': _(
|
||||||
|
'Clear all the page transformations for the '
|
||||||
|
'document: %s?'
|
||||||
|
) % queryset.first()
|
||||||
|
}
|
||||||
|
)
|
||||||
|
|
||||||
previous = request.POST.get('previous', request.GET.get('previous', request.META.get('HTTP_REFERER', post_redirect or reverse('documents:document_list'))))
|
return result
|
||||||
next = request.POST.get('next', request.GET.get('next', request.META.get('HTTP_REFERER', post_redirect or reverse('documents:document_list'))))
|
|
||||||
|
|
||||||
if request.method == 'POST':
|
def object_action(self, form, instance):
|
||||||
for document in documents:
|
try:
|
||||||
try:
|
for page in instance.pages.all():
|
||||||
for page in document.pages.all():
|
Transformation.objects.get_for_model(page).delete()
|
||||||
Transformation.objects.get_for_model(page).delete()
|
except Exception as exception:
|
||||||
except Exception as exception:
|
messages.error(
|
||||||
messages.error(
|
self.request, _(
|
||||||
request, _(
|
'Error deleting the page transformations for '
|
||||||
'Error deleting the page transformations for '
|
'document: %(document)s; %(error)s.'
|
||||||
'document: %(document)s; %(error)s.'
|
) % {
|
||||||
) % {
|
'document': instance, 'error': exception
|
||||||
'document': document, 'error': exception
|
}
|
||||||
}
|
)
|
||||||
)
|
|
||||||
else:
|
|
||||||
messages.success(
|
|
||||||
request, _(
|
|
||||||
'All the page transformations for document: %s, '
|
|
||||||
'have been deleted successfully.'
|
|
||||||
) % document
|
|
||||||
)
|
|
||||||
|
|
||||||
return HttpResponseRedirect(next)
|
|
||||||
|
|
||||||
context = {
|
|
||||||
'delete_view': True,
|
|
||||||
'next': next,
|
|
||||||
'previous': previous,
|
|
||||||
'title': ungettext(
|
|
||||||
'Clear all the page transformations for the selected document?',
|
|
||||||
'Clear all the page transformations for the selected documents?',
|
|
||||||
documents.count()
|
|
||||||
)
|
|
||||||
}
|
|
||||||
|
|
||||||
if documents.count() == 1:
|
|
||||||
context['object'] = documents.first()
|
|
||||||
|
|
||||||
return render_to_response(
|
|
||||||
'appearance/generic_confirm.html', context,
|
|
||||||
context_instance=RequestContext(request)
|
|
||||||
)
|
|
||||||
|
|
||||||
|
|
||||||
def document_multiple_clear_transformations(request):
|
|
||||||
return document_clear_transformations(
|
|
||||||
request, document_id_list=request.GET.get(
|
|
||||||
'id_list', request.POST.get('id_list', '')
|
|
||||||
).split(',')
|
|
||||||
)
|
|
||||||
|
|
||||||
|
|
||||||
class DocumentPrint(FormView):
|
class DocumentPrint(FormView):
|
||||||
|
|||||||
Reference in New Issue
Block a user