From 5ed21519e6fc48f1f3c465c5eaf4400b737f37a8 Mon Sep 17 00:00:00 2001 From: Roberto Rosario Date: Wed, 7 Dec 2011 04:51:50 -0400 Subject: [PATCH 1/7] Fix statistics --- apps/documents/statistics.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/apps/documents/statistics.py b/apps/documents/statistics.py index 786f902651..8787c7eb22 100644 --- a/apps/documents/statistics.py +++ b/apps/documents/statistics.py @@ -3,7 +3,7 @@ from django.utils.translation import ugettext_lazy as _ from common.utils import pretty_size, pretty_size_10 from documents.conf.settings import STORAGE_BACKEND -from documents.models import Document, DocumentType, DocumentPage +from documents.models import Document, DocumentType, DocumentPage, DocumentVersion from django.db.models import Avg, Count, Min, Max @@ -54,9 +54,9 @@ def get_statistics(): paragraphs.extend( [ _(u'Document pages in database: %d') % DocumentPage.objects.only('pk',).count(), - _(u'Minimum amount of pages per document: %(page_count__min)d') % Document.objects.annotate(page_count=Count('documentpage')).aggregate(Min('page_count')), - _(u'Maximum amount of pages per document: %(page_count__max)d') % Document.objects.annotate(page_count=Count('documentpage')).aggregate(Max('page_count')), - _(u'Average amount of pages per document: %(page_count__avg)f') % Document.objects.annotate(page_count=Count('documentpage')).aggregate(Avg('page_count')), + _(u'Minimum amount of pages per document: %(page_count__min)d') % DocumentVersion.objects.annotate(page_count=Count('documentpage')).aggregate(Min('page_count')), + _(u'Maximum amount of pages per document: %(page_count__max)d') % DocumentVersion.objects.annotate(page_count=Count('documentpage')).aggregate(Max('page_count')), + _(u'Average amount of pages per document: %(page_count__avg)f') % DocumentVersion.objects.annotate(page_count=Count('documentpage')).aggregate(Avg('page_count')), ] ) #[(day_count['date_added'].strftime('%Y-%m-%d'), day_count['id__count']) for day_count in Document.objects.values('date_added').annotate(Count("id"))] From 227747f4693bbd66b266924786e63ad2674b6d33 Mon Sep 17 00:00:00 2001 From: Roberto Rosario Date: Thu, 8 Dec 2011 17:09:52 -0400 Subject: [PATCH 2/7] update website address --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 6987954b0c..6c5f26ffd1 100644 --- a/README.md +++ b/README.md @@ -3,7 +3,7 @@ Mayan Open source, Django based document manager with custom metadata indexing, file serving integration and OCR capabilities. -[Website](http://bit.ly/mayan-edms) +[Website](http://www.mayan-edms.com) [Video demostration](http://bit.ly/pADNXv) From fe5a42240d4f336491b6375d9fba64f33cae2cd0 Mon Sep 17 00:00:00 2001 From: Roberto Rosario Date: Tue, 10 Jan 2012 15:21:10 -0400 Subject: [PATCH 3/7] Fix redirect view name --- apps/linking/views.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/apps/linking/views.py b/apps/linking/views.py index 2b1770cb12..bcc92fcfe6 100644 --- a/apps/linking/views.py +++ b/apps/linking/views.py @@ -122,7 +122,7 @@ def smart_link_create(request): if form.is_valid(): document_group = form.save() messages.success(request, _(u'Smart link: %s created successfully.') % document_group) - return HttpResponseRedirect(reverse('document_group_list')) + return HttpResponseRedirect(reverse('smart_link_list')) else: form = SmartLinkForm() @@ -142,7 +142,7 @@ def smart_link_edit(request, smart_link_pk): if form.is_valid(): smart_link = form.save() messages.success(request, _(u'Smart link: %s edited successfully.') % smart_link) - return HttpResponseRedirect(reverse('document_group_list')) + return HttpResponseRedirect(reverse('smart_link_list')) else: form = SmartLinkForm(instance=smart_link) From 040a51348d394f98f5f679e98ba40b17048f12d9 Mon Sep 17 00:00:00 2001 From: Roberto Rosario Date: Sat, 21 Jan 2012 04:46:48 -0400 Subject: [PATCH 4/7] Added mailing list --- README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/README.md b/README.md index 6c5f26ffd1..0695d8fa3a 100644 --- a/README.md +++ b/README.md @@ -5,6 +5,8 @@ Open source, Django based document manager with custom metadata indexing, file s [Website](http://www.mayan-edms.com) +[Mailing list (via Google Groups)](http://groups.google.com/group/mayan-edms) + [Video demostration](http://bit.ly/pADNXv) [Documentation](http://readthedocs.org/docs/mayan/en/latest/) From 603f6eec3eedc655fc4dbd86224cf4cd14d86c0f Mon Sep 17 00:00:00 2001 From: Roberto Rosario Date: Thu, 2 Feb 2012 05:15:47 -0400 Subject: [PATCH 5/7] =?UTF-8?q?Add=20=D0=A1=D0=B5=D1=80=D0=B3=D0=B5=D0=B9?= =?UTF-8?q?=20=D0=93=D0=BB=D0=B8=D1=82=D0=B0=20(https://github.com/gsv70)?= =?UTF-8?q?=20fix=20for=20issue=20#17?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- requirements/production.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/requirements/production.txt b/requirements/production.txt index cc3232892b..c6c3feac05 100644 --- a/requirements/production.txt +++ b/requirements/production.txt @@ -19,3 +19,4 @@ djangorestframework==0.2.3 South==0.7.3 python-gnupg==0.2.8 python-hkp==0.1.3 +kombu==1.4.2 From f9be37768e97aba7206d8ddb2e08fc50cfdef1e8 Mon Sep 17 00:00:00 2001 From: Roberto Rosario Date: Thu, 2 Feb 2012 05:21:20 -0400 Subject: [PATCH 6/7] Bump version to 0.11.2 --- apps/main/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/main/__init__.py b/apps/main/__init__.py index 822a2c8cfa..5a086612d9 100644 --- a/apps/main/__init__.py +++ b/apps/main/__init__.py @@ -19,7 +19,7 @@ __status__ = 'Production' __version_info__ = { 'major': 0, 'minor': 11, - 'micro': 1, + 'micro': 2, 'releaselevel': 'final', 'serial': 0 } From c117a907e40237a198ac1dc7d2c5378f46e2b2c7 Mon Sep 17 00:00:00 2001 From: Roberto Rosario Date: Thu, 2 Feb 2012 05:21:32 -0400 Subject: [PATCH 7/7] Update changelog --- docs/changelog.rst | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/docs/changelog.rst b/docs/changelog.rst index 80d0787351..3396407b17 100644 --- a/docs/changelog.rst +++ b/docs/changelog.rst @@ -1,3 +1,8 @@ +Version 0.11.2 +-------------- +* Fix issue #17, thanks to Сергей Глита (https://github.com/gsv70) for + finding this one. + Version 0.11 ------------ * Support for signed documents verification added, embedded and detached