Merge remote branch 'origin/master' into multi

apps/documents/views.py

@@ -70,7 +70,7 @@ def document_list(request):
             
     return object_list(
         request,
-        queryset=Document.objects.only('file_filename', 'file_filename', 'file_extension').all(),
+        queryset=Document.objects.only('file_filename', 'file_extension').all(),
         template_name='generic_list.html',
         extra_context={
             'title':_(u'documents'),

apps/dynamic_search/api.py

@@ -84,8 +84,8 @@ def perform_search(query_string):
                     model_result_ids &= single_result_ids
                 
             result_count += len(model_result_ids)
-            results = model.objects.filter(pk__in=list(model_result_ids)[:LIMIT])[:LIMIT]
-            shown_result_count += results.count()                
+            results = model.objects.in_bulk(list(model_result_ids)[:LIMIT]).values()
+            shown_result_count += len(results)
             if results:
                 model_list[data['text']] = results
                 for result in results:

docs/TODO

@@ -173,3 +173,4 @@ OCR
 * Support ocropus
 * Support cuneiform
 * Implement StringIO
+* Add storage replication delay setting