Added remaining functionality to document indexing (filesystem rebuild, better warning reporting)
This commit is contained in:
@@ -1,11 +1,8 @@
|
||||
from django.utils.translation import ugettext_lazy as _
|
||||
from django.utils.translation import ugettext
|
||||
from django.http import HttpResponseRedirect
|
||||
from django.shortcuts import render_to_response, get_object_or_404
|
||||
from django.template import RequestContext
|
||||
from django.contrib import messages
|
||||
from django.core.urlresolvers import reverse
|
||||
from django.conf import settings
|
||||
from django.utils.safestring import mark_safe
|
||||
|
||||
from permissions.api import check_permissions
|
||||
@@ -33,13 +30,13 @@ def index_instance_list(request, index_id=None):
|
||||
breadcrumbs = get_instance_link()
|
||||
|
||||
title = mark_safe(_(u'contents for index: %s') % breadcrumbs)
|
||||
|
||||
|
||||
return render_to_response('generic_list.html', {
|
||||
'object_list': index_instance_list,
|
||||
'title': title,
|
||||
'hide_links': True,
|
||||
}, context_instance=RequestContext(request))
|
||||
|
||||
|
||||
|
||||
def rebuild_index_instances(request):
|
||||
check_permissions(request.user, 'document_indexing', [PERMISSION_DOCUMENT_INDEXING_REBUILD_INDEXES])
|
||||
@@ -55,7 +52,7 @@ def rebuild_index_instances(request):
|
||||
}, context_instance=RequestContext(request))
|
||||
else:
|
||||
try:
|
||||
errors, warnings = do_rebuild_all_indexes()
|
||||
warnings = do_rebuild_all_indexes()
|
||||
messages.success(request, _(u'Index rebuild completed successfully.'))
|
||||
for warning in warnings:
|
||||
messages.warning(request, warning)
|
||||
|
||||
Reference in New Issue
Block a user