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

Merge branch 'feature/signal_based_indexing' into development

Browse Source
This commit is contained in:
Roberto Rosario
2012-03-14 15:27:53 -04:00
parent 0ff1843545 11ca6772ef
commit 40d76b3476
8 changed files with 87 additions and 77 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
apps/document_indexing/__init__.py
View File

@@ -1,13 +1,18 @@
from __future__ import absolute_import from __future__ import absolute_import
import logging
from django.utils.translation import ugettext_lazy as _ from django.utils.translation import ugettext_lazy as _
from django.db.models.signals import pre_save, post_save, pre_delete
from django.dispatch import receiver
from navigation.api import (register_top_menu, register_sidebar_template, from navigation.api import (register_top_menu, register_sidebar_template,
register_links) register_links)
from main.api import register_maintenance_links from main.api import register_maintenance_links
from documents.permissions import PERMISSION_DOCUMENT_VIEW from documents.permissions import PERMISSION_DOCUMENT_VIEW
from documents.models import Document from documents.models import Document, DocumentVersion
from metadata.models import DocumentMetadata
from project_setup.api import register_setup from project_setup.api import register_setup
from .models import (Index, IndexTemplateNode, IndexInstanceNode) from .models import (Index, IndexTemplateNode, IndexInstanceNode)
@@ -18,7 +23,7 @@ from .permissions import (PERMISSION_DOCUMENT_INDEXING_VIEW,
PERMISSION_DOCUMENT_INDEXING_EDIT, PERMISSION_DOCUMENT_INDEXING_EDIT,
PERMISSION_DOCUMENT_INDEXING_DELETE PERMISSION_DOCUMENT_INDEXING_DELETE
) )
from .api import update_indexes, delete_indexes
def is_root_node(context): def is_root_node(context):
return context['node'].parent is None return context['node'].parent is None
@@ -27,6 +32,7 @@ def is_root_node(context):
def is_not_instance_root_node(context): def is_not_instance_root_node(context):
return context['object'].parent is not None return context['object'].parent is not None
logger = logging.getLogger(__name__)
index_setup = {'text': _(u'indexes'), 'view': 'index_setup_list', 'icon': 'tab.png', 'permissions': [PERMISSION_DOCUMENT_INDEXING_SETUP], 'children_view_regex': [r'^index_setup', r'^template_node']} index_setup = {'text': _(u'indexes'), 'view': 'index_setup_list', 'icon': 'tab.png', 'permissions': [PERMISSION_DOCUMENT_INDEXING_SETUP], 'children_view_regex': [r'^index_setup', r'^template_node']}
index_setup_list = {'text': _(u'index list'), 'view': 'index_setup_list', 'famfam': 'tab', 'permissions': [PERMISSION_DOCUMENT_INDEXING_SETUP]} index_setup_list = {'text': _(u'index list'), 'view': 'index_setup_list', 'famfam': 'tab', 'permissions': [PERMISSION_DOCUMENT_INDEXING_SETUP]}
@@ -63,3 +69,29 @@ register_links([Index, 'index_setup_list', 'index_setup_create', 'template_node_
register_links(Index, [index_setup_edit, index_setup_delete, index_setup_view]) register_links(Index, [index_setup_edit, index_setup_delete, index_setup_view])
register_links(IndexTemplateNode, [template_node_create, template_node_edit, template_node_delete]) register_links(IndexTemplateNode, [template_node_create, template_node_edit, template_node_delete])
def delete_indexes_handler(sender, instance, **kwargs):
if isinstance(instance, DocumentVersion):
logger.debug('received pre save signal - document version')
logger.debug('instance: %s' % instance)
delete_indexes(instance.document)
elif isinstance(instance, DocumentMetadata):
logger.debug('received pre save signal - document metadata')
logger.debug('instance: %s' % instance)
delete_indexes(instance.document)
@receiver(post_save, dispatch_uid='update_indexes_handler')
def update_indexes_handler(sender, instance, **kwargs):
if isinstance(instance, DocumentVersion):
logger.debug('received post save signal - document version')
logger.debug('instance: %s' % instance)
update_indexes(instance.document)
elif isinstance(instance, DocumentMetadata):
logger.debug('received post save signal - document metadata')
logger.debug('instance: %s' % instance)
update_indexes(instance.document)
pre_save.connect(delete_indexes_handler, dispatch_uid='delete_indexes_handler_on_update')
pre_delete.connect(delete_indexes_handler, dispatch_uid='delete_indexes_handler_on_delete')

2
apps/documents/__init__.py
View File

@@ -167,7 +167,7 @@ register_maintenance_links([document_find_all_duplicates, document_update_page_c
register_model_list_columns(Document, [ register_model_list_columns(Document, [
{'name':_(u'thumbnail'), 'attribute': {'name':_(u'thumbnail'), 'attribute':
encapsulate(lambda x: document_thumbnail(x)) encapsulate(lambda x: document_thumbnail(x, gallery_name='document_list', title=x.filename))
}, },
{'name':_(u'metadata'), 'attribute': {'name':_(u'metadata'), 'attribute':
encapsulate(lambda x: get_metadata_string(x)) encapsulate(lambda x: get_metadata_string(x))

3
apps/documents/forms.py
View File

@@ -97,7 +97,7 @@ class DocumentPageForm_edit(forms.ModelForm):
# Document forms # Document forms
class DocumentPagesCarouselWidget(forms.widgets.Widget): class DocumentPagesCarouselWidget(forms.widgets.Widget):
""" """
Display many small representations of a document pages Display many small representations of document pages
""" """
def render(self, name, value, attrs=None): def render(self, name, value, attrs=None):
output = [] output = []
@@ -115,6 +115,7 @@ class DocumentPagesCarouselWidget(forms.widgets.Widget):
page=page.page_number, page=page.page_number,
gallery_name='document_pages', gallery_name='document_pages',
fancybox_class='fancybox-noscaling', fancybox_class='fancybox-noscaling',
title=ugettext(u'Page %d of %d') % (page.page_number, len(value.pages.all()))
) )
) )
output.append(u'<div class="tc">') output.append(u'<div class="tc">')

30
apps/documents/views.py
View File

@@ -29,7 +29,6 @@ from filetransfers.api import serve_file
from metadata.forms import MetadataFormSet, MetadataSelectionForm from metadata.forms import MetadataFormSet, MetadataSelectionForm
from navigation.utils import resolve_to_name from navigation.utils import resolve_to_name
from permissions.models import Permission from permissions.models import Permission
from document_indexing.api import update_indexes, delete_indexes
from history.api import create_history from history.api import create_history
from acls.models import AccessEntry from acls.models import AccessEntry
from common.compressed_files import CompressedFile from common.compressed_files import CompressedFile
@@ -208,11 +207,6 @@ def document_delete(request, document_id=None, document_id_list=None):
if request.method == 'POST': if request.method == 'POST':
for document in documents: for document in documents:
try: try:
warnings = delete_indexes(document)
if request.user.is_staff or request.user.is_superuser:
for warning in warnings:
messages.warning(request, warning)
document.delete() document.delete()
#create_history(HISTORY_DOCUMENT_DELETED, data={'user': request.user, 'document': document}) #create_history(HISTORY_DOCUMENT_DELETED, data={'user': request.user, 'document': document})
messages.success(request, _(u'Document deleted successfully.')) messages.success(request, _(u'Document deleted successfully.'))
@@ -257,29 +251,25 @@ def document_edit(request, document_id):
old_document = copy.copy(document) old_document = copy.copy(document)
form = DocumentForm_edit(request.POST, instance=document) form = DocumentForm_edit(request.POST, instance=document)
if form.is_valid(): if form.is_valid():
warnings = delete_indexes(document)
if request.user.is_staff or request.user.is_superuser:
for warning in warnings:
messages.warning(request, warning)
document.filename = form.cleaned_data['new_filename']
document.description = form.cleaned_data['description']
if 'document_type_available_filenames' in form.cleaned_data: if 'document_type_available_filenames' in form.cleaned_data:
if form.cleaned_data['document_type_available_filenames']: if form.cleaned_data['document_type_available_filenames']:
document.filename = form.cleaned_data['document_type_available_filenames'].filename new_filename = form.cleaned_data['document_type_available_filenames'].filename
else:
new_filename = form.cleaned_data['new_filename']
else:
new_filename = form.cleaned_data['new_filename']
print 'new_filename', new_filename
document.filename = new_filename
document.description = form.cleaned_data['description']
document.save() document.save()
create_history(HISTORY_DOCUMENT_EDITED, document, {'user': request.user, 'diff': return_diff(old_document, document, ['filename', 'description'])}) create_history(HISTORY_DOCUMENT_EDITED, document, {'user': request.user, 'diff': return_diff(old_document, document, ['filename', 'description'])})
RecentDocument.objects.add_document_for_user(request.user, document) RecentDocument.objects.add_document_for_user(request.user, document)
messages.success(request, _(u'Document "%s" edited successfully.') % document) messages.success(request, _(u'Document "%s" edited successfully.') % document)
warnings = update_indexes(document)
if request.user.is_staff or request.user.is_superuser:
for warning in warnings:
messages.warning(request, warning)
return HttpResponseRedirect(document.get_absolute_url()) return HttpResponseRedirect(document.get_absolute_url())
else: else:
form = DocumentForm_edit(instance=document, initial={ form = DocumentForm_edit(instance=document, initial={

13
apps/documents/widgets.py
View File

@@ -11,15 +11,15 @@ from converter.literals import (DEFAULT_ZOOM_LEVEL, DEFAULT_ROTATION,
from mimetype.api import get_error_icon_url from mimetype.api import get_error_icon_url
def document_thumbnail(document): def document_thumbnail(document, **kwargs):
return document_html_widget(document, click_view='document_preview') return document_html_widget(document, click_view='document_preview', **kwargs)
def document_link(document): def document_link(document):
return mark_safe(u'<a href="%s">%s</a>' % (reverse('document_view_simple', args=[document.pk]), document)) return mark_safe(u'<a href="%s">%s</a>' % (reverse('document_view_simple', args=[document.pk]), document))
def document_html_widget(document, view='document_thumbnail', click_view=None, page=DEFAULT_PAGE_NUMBER, zoom=DEFAULT_ZOOM_LEVEL, rotation=DEFAULT_ROTATION, gallery_name=None, fancybox_class='fancybox', version=None): def document_html_widget(document, view='document_thumbnail', click_view=None, page=DEFAULT_PAGE_NUMBER, zoom=DEFAULT_ZOOM_LEVEL, rotation=DEFAULT_ROTATION, gallery_name=None, fancybox_class='fancybox', version=None, title=None):
result = [] result = []
alt_text = _(u'document page image') alt_text = _(u'document page image')
@@ -47,8 +47,13 @@ def document_html_widget(document, view='document_thumbnail', click_view=None, p
result.append(u'<div class="tc" id="document-%d-%d">' % (document.pk, page if page else 1)) result.append(u'<div class="tc" id="document-%d-%d">' % (document.pk, page if page else 1))
if title:
title_template = u'title="%s"' % title
else:
title_template = u''
if click_view: if click_view:
result.append(u'<a %s class="%s" href="%s">' % (gallery_template, fancybox_class, u'%s?%s' % (reverse(click_view, args=[document.pk]), query_string))) result.append(u'<a %s class="%s" href="%s" %s>' % (gallery_template, fancybox_class, u'%s?%s' % (reverse(click_view, args=[document.pk]), query_string), title_template))
result.append(u'<img class="thin_border lazy-load" data-href="%s" src="%simages/ajax-loader.gif" alt="%s" />' % (preview_view, settings.STATIC_URL, alt_text)) result.append(u'<img class="thin_border lazy-load" data-href="%s" src="%simages/ajax-loader.gif" alt="%s" />' % (preview_view, settings.STATIC_URL, alt_text))
result.append(u'<noscript><img style="border: 1px solid black;" src="%s" alt="%s" /></noscript>' % (preview_view, alt_text)) result.append(u'<noscript><img style="border: 1px solid black;" src="%s" alt="%s" /></noscript>' % (preview_view, alt_text))

2
apps/linking/forms.py
View File

@@ -48,7 +48,7 @@ class SmartLinkImageWidget(forms.widgets.Widget):
output.append(u'<div class="tc">%s: %d</div>' % (ugettext(u'Pages'), document.pages.count())) output.append(u'<div class="tc">%s: %d</div>' % (ugettext(u'Pages'), document.pages.count()))
output.append(get_tags_inline_widget(document)) output.append(get_tags_inline_widget(document))
output.append(u'<div style="padding: 5px;">' % document) output.append(u'<div style="padding: 5px;">' % document)
output.append(document_html_widget(document, click_view='document_display', view='document_preview_multipage', fancybox_class='fancybox-noscaling', gallery_name=u'smart_link_%d_documents_gallery' % value['smart_link_instance'].pk)) output.append(document_html_widget(document, click_view='document_display', view='document_preview_multipage', fancybox_class='fancybox-noscaling', gallery_name=u'smart_link_%d_documents_gallery' % value['smart_link_instance'].pk, title=document.filename))
output.append(u'</div>') output.append(u'</div>')
output.append(u'<div class="tc">') output.append(u'<div class="tc">')
output.append(u'<a href="%s"><span class="famfam active famfam-page_go"></span>%s</a>' % (reverse('document_view_simple', args=[document.pk]), ugettext(u'Select'))) output.append(u'<a href="%s"><span class="famfam active famfam-page_go"></span>%s</a>' % (reverse('document_view_simple', args=[document.pk]), ugettext(u'Select')))

51
apps/main/templates/base.html
View File

@@ -131,33 +131,42 @@
}); });
$("a.fancybox").fancybox({ $("a.fancybox").fancybox({
'titleShow' : false, 'titleShow' : true,
'transitionIn' : 'elastic', 'transitionIn' : 'elastic',
'transitionOut' : 'elastic', 'transitionOut' : 'elastic',
'easingIn' : 'easeOutBack', 'easingIn' : 'easeOutBack',
'easingOut' : 'easeInBack', 'easingOut' : 'easeInBack',
'type' : 'image', 'type' : 'image',
'autoScale' : true 'autoScale' : true,
'onComplete': function() {
$("#fancybox-title").css({'top':'0px', 'bottom':'auto'});
}
}); });
$("a.fancybox-staging").fancybox({ $("a.fancybox-staging").fancybox({
'titleShow' : true, 'titleShow' : true,
'transitionIn' : 'elastic', 'transitionIn' : 'elastic',
'transitionOut' : 'elastic', 'transitionOut' : 'elastic',
'easingIn' : 'easeOutBack', 'easingIn' : 'easeOutBack',
'easingOut' : 'easeInBack', 'easingOut' : 'easeInBack',
'type' : 'image', 'type' : 'image',
'autoScale' : true 'autoScale' : true,
'onComplete': function() {
$("#fancybox-title").css({'top':'0px', 'bottom':'auto'});
}
}); });
$("a.fancybox-noscaling").fancybox({ $("a.fancybox-noscaling").fancybox({
'titleShow' : false, 'titleShow' : true,
'transitionIn' : 'elastic', 'transitionIn' : 'elastic',
'transitionOut' : 'elastic', 'transitionOut' : 'elastic',
'easingIn' : 'easeOutBack', 'easingIn' : 'easeOutBack',
'easingOut' : 'easeInBack', 'easingOut' : 'easeInBack',
'type' : 'image', 'type' : 'image',
'autoScale' : false 'autoScale' : false,
'onComplete': function() {
$("#fancybox-title").css({'top':'0px', 'bottom':'auto'});
}
}); });
$("a.fancybox-iframe").fancybox({ $("a.fancybox-iframe").fancybox({

27
apps/metadata/views.py
View File

@@ -13,7 +13,6 @@ from django.core.exceptions import PermissionDenied
from documents.permissions import PERMISSION_DOCUMENT_TYPE_EDIT from documents.permissions import PERMISSION_DOCUMENT_TYPE_EDIT
from documents.models import Document, RecentDocument, DocumentType from documents.models import Document, RecentDocument, DocumentType
from permissions.models import Permission from permissions.models import Permission
from document_indexing.api import update_indexes, delete_indexes
from acls.models import AccessEntry from acls.models import AccessEntry
from common.utils import generate_choices_w_labels, encapsulate, get_object_name from common.utils import generate_choices_w_labels, encapsulate, get_object_name
@@ -80,12 +79,6 @@ def metadata_edit(request, document_id=None, document_id_list=None):
formset = MetadataFormSet(request.POST) formset = MetadataFormSet(request.POST)
if formset.is_valid(): if formset.is_valid():
for document in documents: for document in documents:
warnings = delete_indexes(document)
if request.user.is_staff or request.user.is_superuser:
for warning in warnings:
messages.warning(request, _(u'Error deleting document indexes; %s') % warning)
errors = [] errors = []
for form in formset.forms: for form in formset.forms:
if form.cleaned_data['update']: if form.cleaned_data['update']:
@@ -101,13 +94,6 @@ def metadata_edit(request, document_id=None, document_id_list=None):
else: else:
messages.success(request, _(u'Metadata for document %s edited successfully.') % document) messages.success(request, _(u'Metadata for document %s edited successfully.') % document)
warnings = update_indexes(document)
if warnings and (request.user.is_staff or request.user.is_superuser):
for warning in warnings:
messages.warning(request, _(u'Error updating document indexes; %s') % warning)
else:
messages.success(request, _(u'Document indexes updated successfully.'))
return HttpResponseRedirect(next) return HttpResponseRedirect(next)
context = { context = {
@@ -244,12 +230,6 @@ def metadata_remove(request, document_id=None, document_id_list=None):
formset = MetadataRemoveFormSet(request.POST) formset = MetadataRemoveFormSet(request.POST)
if formset.is_valid(): if formset.is_valid():
for document in documents: for document in documents:
warnings = delete_indexes(document)
if request.user.is_staff or request.user.is_superuser:
for warning in warnings:
messages.warning(request, _(u'Error deleting document indexes; %s') % warning)
for form in formset.forms: for form in formset.forms:
if form.cleaned_data['update']: if form.cleaned_data['update']:
metadata_type = get_object_or_404(MetadataType, pk=form.cleaned_data['id']) metadata_type = get_object_or_404(MetadataType, pk=form.cleaned_data['id'])
@@ -262,13 +242,6 @@ def metadata_remove(request, document_id=None, document_id_list=None):
messages.error(request, _(u'Error removing metadata type: %(metadata_type)s from document: %(document)s.') % { messages.error(request, _(u'Error removing metadata type: %(metadata_type)s from document: %(document)s.') % {
'metadata_type': metadata_type, 'document': document}) 'metadata_type': metadata_type, 'document': document})
warnings = update_indexes(document)
if warnings and (request.user.is_staff or request.user.is_superuser):
for warning in warnings:
messages.warning(request, _(u'Error updating document indexes; %s') % warning)
else:
messages.success(request, _(u'Document indexes updated successfully.'))
return HttpResponseRedirect(next) return HttpResponseRedirect(next)
context = { context = {