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

Update the index rebuild view to CBV.

Browse Source
This commit is contained in:
Roberto Rosario
2015-09-16 05:33:01 -04:00
parent 6ca6cd9f21
commit 86e099dd7b
2 changed files with 21 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
mayan/apps/document_indexing/urls.py
View File

@@ -9,9 +9,9 @@ from .api_views import (
) )
from .views import ( from .views import (
DocumentIndexNodeListView, IndexInstanceNodeView, IndexListView, DocumentIndexNodeListView, IndexInstanceNodeView, IndexListView,
SetupIndexDocumentTypesView, SetupIndexCreateView, SetupIndexDeleteView, RebuildIndexesConfirmView, SetupIndexDocumentTypesView,
SetupIndexEditView, SetupIndexListView, SetupIndexTreeTemplateListView, SetupIndexCreateView, SetupIndexDeleteView, SetupIndexEditView,
TemplateNodeDeleteView SetupIndexListView, SetupIndexTreeTemplateListView, TemplateNodeDeleteView
) )
urlpatterns = patterns( urlpatterns = patterns(
@@ -61,7 +61,7 @@ urlpatterns = patterns(
), ),
url( url(
r'^rebuild/all/$', 'rebuild_index_instances', r'^rebuild/all/$', RebuildIndexesConfirmView.as_view(),
name='rebuild_index_instances' name='rebuild_index_instances'
), ),
url( url(

44
mayan/apps/document_indexing/views.py
View File

@@ -12,8 +12,8 @@ from django.utils.translation import ugettext_lazy as _
from acls.models import AccessControlList from acls.models import AccessControlList
from common.views import ( from common.views import (
AssignRemoveView, SingleObjectCreateView, SingleObjectDeleteView, AssignRemoveView, ConfirmView, SingleObjectCreateView,
SingleObjectEditView, SingleObjectListView SingleObjectDeleteView, SingleObjectEditView, SingleObjectListView
) )
from documents.models import Document, DocumentType from documents.models import Document, DocumentType
from documents.permissions import permission_document_view from documents.permissions import permission_document_view
@@ -294,31 +294,6 @@ class IndexInstanceNodeView(DocumentListView, SingleObjectListView):
return context return context
def rebuild_index_instances(request):
"""
Confirmation view to execute the tool: do_rebuild_all_indexes
"""
Permission.check_permissions(
request.user, (permission_document_indexing_rebuild_indexes,)
)
previous = request.POST.get('previous', request.GET.get('previous', request.META.get('HTTP_REFERER', reverse(settings.LOGIN_REDIRECT_URL))))
next = request.POST.get('next', request.GET.get('next', request.META.get('HTTP_REFERER', reverse(settings.LOGIN_REDIRECT_URL))))
if request.method != 'POST':
return render_to_response('appearance/generic_confirm.html', {
'previous': previous,
'next': next,
'title': _('Rebuild all indexes?'),
'message': _('On large databases this operation may take some time to execute.'),
}, context_instance=RequestContext(request))
else:
task_do_rebuild_all_indexes.apply_async()
messages.success(request, _('Index rebuild queued successfully.'))
return HttpResponseRedirect(next)
class DocumentIndexNodeListView(SingleObjectListView): class DocumentIndexNodeListView(SingleObjectListView):
""" """
Show a list of indexes where the current document can be found Show a list of indexes where the current document can be found
@@ -355,3 +330,18 @@ class DocumentIndexNodeListView(SingleObjectListView):
def get_queryset(self): def get_queryset(self):
return DocumentIndexInstanceNode.objects.get_for(self.get_document()) return DocumentIndexInstanceNode.objects.get_for(self.get_document())
class RebuildIndexesConfirmView(ConfirmView):
extra_context = {
'message': _('On large databases this operation may take some time to execute.'),
'title': _('Rebuild all indexes?'),
}
view_permission = permission_document_indexing_rebuild_indexes
def get_post_action_redirect(self):
return reverse('common:tools_list')
def view_action(self):
task_do_rebuild_all_indexes.apply_async()
messages.success(self.request, _('Index rebuild queued successfully.'))