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

Update the linking app to be compatible with the new document versioning fields

Browse Source
This commit is contained in:
Roberto Rosario
2011-12-04 00:00:07 -04:00
parent 43b17456d1
commit e6d3453800
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
apps/linking/forms.py
View File

@@ -45,7 +45,7 @@ class SmartLinkImageWidget(forms.widgets.Widget):
for document in value['documents']:
output.append(u'<div style="display: inline-block; margin: 0px 10px 10px 10px; %s">' % (u'border: 5px solid black; padding: 3px;' if value['current_document'] == document else u''))
output.append(u'<div class="tc">%s</div>' % document)
output.append(u'<div class="tc">%s: %d</div>' % (ugettext(u'Pages'), document.documentpage_set.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(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))

2
apps/linking/managers.py
View File

@@ -59,7 +59,7 @@ class SmartLinkManager(models.Manager):
if total_query:
try:
document_qs = Document.objects.filter(total_query)
result[smart_link] = {'documents': document_qs.order_by('file_filename') or []}
result[smart_link] = {'documents': document_qs.order_by('date_added') or []}
except Exception, e:
result[smart_link] = {'documents': []}
errors.append(e)