Merge remote-tracking branch 'origin/development' into development

2012-05-24 03:06:34 -04:00
parent 5b43299c41 08d68e7993
commit e0e95af092
1 changed files with 1 additions and 1 deletions
--- a/apps/documents/links.py
+++ b/apps/documents/links.py
@@ -15,10 +15,10 @@ from .permissions import (PERMISSION_DOCUMENT_CREATE,
    PERMISSION_DOCUMENT_TYPE_EDIT, PERMISSION_DOCUMENT_TYPE_DELETE,
    PERMISSION_DOCUMENT_TYPE_CREATE, PERMISSION_DOCUMENT_TYPE_VIEW,
    PERMISSION_DOCUMENT_NEW_VERSION)
+from .conf.settings import ZOOM_MAX_LEVEL, ZOOM_MIN_LEVEL

 # Document page links expressions

-
 def is_first_page(context):
    return context['page'].page_number <= 1