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

Update document_reset_view to CBV.

Browse Source
This commit is contained in:
Roberto Rosario
2016-03-21 02:05:05 -04:00
parent 308472b92b
commit bd3e31efa4
2 changed files with 15 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
mayan/apps/documents/urls.py
View File

@@ -16,13 +16,14 @@ from .settings import setting_print_size, setting_display_size
from .views import ( from .views import (
DeletedDocumentDeleteView, DeletedDocumentDeleteManyView, DeletedDocumentDeleteView, DeletedDocumentDeleteManyView,
DeletedDocumentListView, DocumentEditView, DocumentListView, DeletedDocumentListView, DocumentEditView, DocumentListView,
DocumentPageView, DocumentPageListView, DocumentPreviewView, DocumentPageView, DocumentPageListView, DocumentPageViewResetView,
DocumentRestoreView, DocumentRestoreManyView, DocumentTrashView, DocumentPreviewView, DocumentRestoreView, DocumentRestoreManyView,
DocumentTrashManyView, DocumentTypeCreateView, DocumentTypeDeleteView, DocumentTrashView, DocumentTrashManyView, DocumentTypeCreateView,
DocumentTypeDocumentListView, DocumentTypeFilenameDeleteView, DocumentTypeDeleteView, DocumentTypeDocumentListView,
DocumentTypeFilenameEditView, DocumentTypeFilenameListView, DocumentTypeFilenameDeleteView, DocumentTypeFilenameEditView,
DocumentTypeListView, DocumentTypeEditView, DocumentVersionListView, DocumentTypeFilenameListView, DocumentTypeListView, DocumentTypeEditView,
DocumentView, EmptyTrashCanView, RecentDocumentListView DocumentVersionListView, DocumentView, EmptyTrashCanView,
RecentDocumentListView
) )
urlpatterns = patterns( urlpatterns = patterns(
@@ -190,8 +191,8 @@ urlpatterns = patterns(
'document_page_rotate_left', name='document_page_rotate_left' 'document_page_rotate_left', name='document_page_rotate_left'
), ),
url( url(
r'^page/(?P<document_page_id>\d+)/reset/$', r'^page/(?P<pk>\d+)/reset/$', DocumentPageViewResetView.as_view(),
'document_page_view_reset', name='document_page_view_reset' name='document_page_view_reset'
), ),
# Admin views # Admin views

9
mayan/apps/documents/views.py
View File

@@ -13,6 +13,7 @@ from django.shortcuts import render_to_response, get_object_or_404
from django.template import RequestContext 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
from django.views.generic import RedirectView
from acls.models import AccessControlList from acls.models import AccessControlList
from common.compressed_files import CompressedFile from common.compressed_files import CompressedFile
@@ -288,6 +289,10 @@ class DocumentPageView(SimpleView):
return get_object_or_404(DocumentPage, pk=self.kwargs['pk']) return get_object_or_404(DocumentPage, pk=self.kwargs['pk'])
class DocumentPageViewResetView(RedirectView):
pattern_name = 'documents:document_page_view'
class DocumentPreviewView(SingleObjectDetailView): class DocumentPreviewView(SingleObjectDetailView):
form_class = DocumentPreviewForm form_class = DocumentPreviewForm
model = Document model = Document
@@ -971,10 +976,6 @@ def document_multiple_clear_transformations(request):
) )
def document_page_view_reset(request, document_page_id):
return HttpResponseRedirect(reverse('documents:document_page_view', args=(document_page_id,)))
def document_page_navigation_next(request, document_page_id): def document_page_navigation_next(request, document_page_id):
document_page = get_object_or_404(DocumentPage, pk=document_page_id) document_page = get_object_or_404(DocumentPage, pk=document_page_id)