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

Merge branch 'hotfix/v0.11.2' into development

Browse Source 
Conflicts:
	apps/documents/statistics.py
	docs/changelog.rst
This commit is contained in:
Roberto Rosario
2012-02-02 05:23:17 -04:00
parent 1c8fd9e212 c117a907e4
commit f8e2341f4f
5 changed files with 724 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
apps/documents/statistics.py
View File

@@ -1,12 +1,11 @@
from __future__ import absolute_import
from django.utils.translation import ugettext_lazy as _
from django.db.models import Avg, Count, Min, Max
from common.utils import pretty_size, pretty_size_10
from .conf.settings import STORAGE_BACKEND
from .models import Document, DocumentType, DocumentPage, DocumentVersion
from documents.conf.settings import STORAGE_BACKEND
from documents.models import Document, DocumentType, DocumentPage, DocumentVersion
from django.db.models import Avg, Count, Min, Max
def get_used_size(path, file_list):