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

Merge remote branch 'origin/master' into multi

Browse Source
This commit is contained in:
Roberto Rosario
2011-03-16 08:16:22 -04:00
parent f78cbddb87 045e633c0d
commit f648aa21a1
3 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
apps/documents/views.py
View File

@@ -70,7 +70,7 @@ def document_list(request):
return object_list( return object_list(
request, 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', template_name='generic_list.html',
extra_context={ extra_context={
'title':_(u'documents'), 'title':_(u'documents'),

4
apps/dynamic_search/api.py
View File

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

1
docs/TODO
View File

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