Import and PEP8 cleanups
This commit is contained in:
@@ -6,7 +6,7 @@ from project_setup.api import register_setup
|
|||||||
from .classes import (AccessHolder, AccessObjectClass, ClassAccessHolder,
|
from .classes import (AccessHolder, AccessObjectClass, ClassAccessHolder,
|
||||||
AccessObject)
|
AccessObject)
|
||||||
|
|
||||||
from .links import (acl_list, acl_detail, acl_grant, acl_revoke,
|
from .links import (acl_detail, acl_grant, acl_revoke,
|
||||||
acl_holder_new, acl_setup_valid_classes, acl_class_list,
|
acl_holder_new, acl_setup_valid_classes, acl_class_list,
|
||||||
acl_class_acl_list, acl_class_acl_detail, acl_class_new_holder_for,
|
acl_class_acl_list, acl_class_acl_detail, acl_class_new_holder_for,
|
||||||
acl_class_grant, acl_class_revoke)
|
acl_class_grant, acl_class_revoke)
|
||||||
|
|||||||
@@ -76,7 +76,7 @@ class AccessEntryManager(models.Manager):
|
|||||||
|
|
||||||
actor = AnonymousUserSingleton.objects.passthru_check(actor)
|
actor = AnonymousUserSingleton.objects.passthru_check(actor)
|
||||||
try:
|
try:
|
||||||
content_type=ContentType.objects.get_for_model(obj)
|
content_type = ContentType.objects.get_for_model(obj)
|
||||||
except AttributeError:
|
except AttributeError:
|
||||||
# Object doesn't have a content type, therefore allow access
|
# Object doesn't have a content type, therefore allow access
|
||||||
return True
|
return True
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
from __future__ import absolute_import
|
from __future__ import absolute_import
|
||||||
|
|
||||||
from project_setup.api import register_setup
|
from project_setup.api import register_setup
|
||||||
from navigation.api import bind_links#, register_sidebar_template
|
from navigation.api import bind_links
|
||||||
|
|
||||||
from .links import database_bootstrap, bootstrap_execute, erase_database_link
|
from .links import database_bootstrap, bootstrap_execute, erase_database_link
|
||||||
from .api import BootstrapSimple, BootstrapPermit
|
from .api import BootstrapSimple, BootstrapPermit
|
||||||
|
|||||||
@@ -7,7 +7,6 @@ from django.contrib.auth.models import User, Group
|
|||||||
from permissions.models import Role
|
from permissions.models import Role
|
||||||
from documents.models import DocumentType, DocumentTypeFilename, Document
|
from documents.models import DocumentType, DocumentTypeFilename, Document
|
||||||
from metadata.models import MetadataType, MetadataSet
|
from metadata.models import MetadataType, MetadataSet
|
||||||
from metadata.api import save_metadata_list
|
|
||||||
from document_indexing.models import Index, IndexTemplateNode
|
from document_indexing.models import Index, IndexTemplateNode
|
||||||
from sources.models import WebForm, StagingFolder
|
from sources.models import WebForm, StagingFolder
|
||||||
from ocr.models import QueueDocument, QueueTransformation, DocumentQueue
|
from ocr.models import QueueDocument, QueueTransformation, DocumentQueue
|
||||||
|
|||||||
@@ -2,8 +2,10 @@ from __future__ import absolute_import
|
|||||||
|
|
||||||
from django.utils.translation import ugettext_lazy as _
|
from django.utils.translation import ugettext_lazy as _
|
||||||
|
|
||||||
|
from navigation.api import Link
|
||||||
|
|
||||||
from .permissions import PERMISSION_BOOTSTRAP_EXECUTE, PERMISSION_NUKE_DATABASE
|
from .permissions import PERMISSION_BOOTSTRAP_EXECUTE, PERMISSION_NUKE_DATABASE
|
||||||
|
|
||||||
database_bootstrap = {'text': _(u'bootstrap database'), 'view': 'bootstrap_type_list', 'icon': 'database_lightning.png', 'permissions': [PERMISSION_BOOTSTRAP_EXECUTE]}
|
database_bootstrap = Link(text=_(u'bootstrap database'), view='bootstrap_type_list', icon='database_lightning.png', permissions=[PERMISSION_BOOTSTRAP_EXECUTE])
|
||||||
bootstrap_execute = {'text': _(u'execute'), 'view': 'bootstrap_execute', 'args': 'object.name', 'sprite': 'database_lightning.png', 'permissions': [PERMISSION_BOOTSTRAP_EXECUTE]}
|
bootstrap_execute = Link(text=_(u'execute'), view='bootstrap_execute', args='object.name', sprite='database_lightning.png', permissions=[PERMISSION_BOOTSTRAP_EXECUTE])
|
||||||
erase_database_link = {'text': _(u'erase database'), 'view': 'erase_database_view', 'icon': 'radioactivity.png', 'permissions': [PERMISSION_NUKE_DATABASE]}
|
erase_database_link = Link(text=_(u'erase database'), view='erase_database_view', icon='radioactivity.png', permissions=[PERMISSION_NUKE_DATABASE])
|
||||||
|
|||||||
@@ -8,4 +8,3 @@ namespace = PermissionNamespace('bootstrap', _(u'Database bootstrap'))
|
|||||||
|
|
||||||
PERMISSION_BOOTSTRAP_EXECUTE = Permission.objects.register(namespace, 'bootstrap_execute', _(u'Execute document bootstraps'))
|
PERMISSION_BOOTSTRAP_EXECUTE = Permission.objects.register(namespace, 'bootstrap_execute', _(u'Execute document bootstraps'))
|
||||||
PERMISSION_NUKE_DATABASE = Permission.objects.register(namespace, 'nuke_database', _(u'Erase the entire database and document storage'))
|
PERMISSION_NUKE_DATABASE = Permission.objects.register(namespace, 'nuke_database', _(u'Erase the entire database and document storage'))
|
||||||
|
|
||||||
|
|||||||
@@ -2,7 +2,7 @@ from __future__ import absolute_import
|
|||||||
|
|
||||||
from django.utils.translation import ugettext_lazy as _
|
from django.utils.translation import ugettext_lazy as _
|
||||||
from django.http import HttpResponseRedirect
|
from django.http import HttpResponseRedirect
|
||||||
from django.shortcuts import render_to_response, get_object_or_404
|
from django.shortcuts import render_to_response
|
||||||
from django.template import RequestContext
|
from django.template import RequestContext
|
||||||
from django.contrib import messages
|
from django.contrib import messages
|
||||||
from django.core.urlresolvers import reverse
|
from django.core.urlresolvers import reverse
|
||||||
|
|||||||
@@ -2,13 +2,10 @@ from __future__ import absolute_import
|
|||||||
|
|
||||||
from django.utils.translation import ugettext_lazy as _
|
from django.utils.translation import ugettext_lazy as _
|
||||||
|
|
||||||
from navigation.api import (bind_links, register_top_menu,
|
from navigation.api import bind_links, register_top_menu
|
||||||
register_model_list_columns,
|
|
||||||
register_sidebar_template, Link)
|
|
||||||
from scheduler.api import register_interval_job
|
from scheduler.api import register_interval_job
|
||||||
|
|
||||||
from documents.models import Document
|
from documents.models import Document
|
||||||
from documents.permissions import PERMISSION_DOCUMENT_VIEW
|
|
||||||
from acls.api import class_permissions
|
from acls.api import class_permissions
|
||||||
|
|
||||||
from .permissions import (PERMISSION_DOCUMENT_CHECKOUT,
|
from .permissions import (PERMISSION_DOCUMENT_CHECKOUT,
|
||||||
@@ -37,6 +34,6 @@ class_permissions(Document, [
|
|||||||
PERMISSION_DOCUMENT_RESTRICTIONS_OVERRIDE
|
PERMISSION_DOCUMENT_RESTRICTIONS_OVERRIDE
|
||||||
])
|
])
|
||||||
|
|
||||||
CHECK_EXPIRED_CHECK_OUTS_INTERVAL=60 # Lowest check out expiration allowed
|
CHECK_EXPIRED_CHECK_OUTS_INTERVAL = 60 # Lowest check out expiration allowed
|
||||||
register_interval_job('task_check_expired_check_outs', _(u'Check expired check out documents and checks them in.'), task_check_expired_check_outs, seconds=CHECK_EXPIRED_CHECK_OUTS_INTERVAL)
|
register_interval_job('task_check_expired_check_outs', _(u'Check expired check out documents and checks them in.'), task_check_expired_check_outs, seconds=CHECK_EXPIRED_CHECK_OUTS_INTERVAL)
|
||||||
initialize_document_checkout_extra_methods()
|
initialize_document_checkout_extra_methods()
|
||||||
|
|||||||
@@ -4,6 +4,7 @@ class DocumentNotCheckedOut(Exception):
|
|||||||
"""
|
"""
|
||||||
pass
|
pass
|
||||||
|
|
||||||
|
|
||||||
class DocumentAlreadyCheckedOut(Exception):
|
class DocumentAlreadyCheckedOut(Exception):
|
||||||
"""
|
"""
|
||||||
Raised when trying to checkout an already checkedout document
|
Raised when trying to checkout an already checkedout document
|
||||||
|
|||||||
@@ -1,7 +1,6 @@
|
|||||||
from __future__ import absolute_import
|
from __future__ import absolute_import
|
||||||
|
|
||||||
from django import forms
|
from django import forms
|
||||||
from django.utils.translation import ugettext_lazy as _
|
|
||||||
|
|
||||||
from .models import DocumentCheckout
|
from .models import DocumentCheckout
|
||||||
from .exceptions import DocumentAlreadyCheckedOut
|
from .exceptions import DocumentAlreadyCheckedOut
|
||||||
|
|||||||
@@ -2,7 +2,6 @@ from __future__ import absolute_import
|
|||||||
|
|
||||||
from django.utils.translation import ugettext_lazy as _
|
from django.utils.translation import ugettext_lazy as _
|
||||||
|
|
||||||
from documents.permissions import PERMISSION_DOCUMENT_VIEW
|
|
||||||
from navigation.api import Link
|
from navigation.api import Link
|
||||||
|
|
||||||
from .permissions import (PERMISSION_DOCUMENT_CHECKOUT, PERMISSION_DOCUMENT_CHECKIN, PERMISSION_DOCUMENT_CHECKIN_OVERRIDE)
|
from .permissions import (PERMISSION_DOCUMENT_CHECKOUT, PERMISSION_DOCUMENT_CHECKIN, PERMISSION_DOCUMENT_CHECKIN_OVERRIDE)
|
||||||
|
|||||||
@@ -96,4 +96,3 @@ class DocumentCheckoutManager(models.Manager):
|
|||||||
return True
|
return True
|
||||||
else:
|
else:
|
||||||
return True
|
return True
|
||||||
|
|
||||||
|
|||||||
@@ -3,7 +3,7 @@ from __future__ import absolute_import
|
|||||||
import logging
|
import logging
|
||||||
import datetime
|
import datetime
|
||||||
|
|
||||||
from django.db import models, IntegrityError
|
from django.db import models
|
||||||
from django.utils.translation import ugettext_lazy as _
|
from django.utils.translation import ugettext_lazy as _
|
||||||
from django.contrib.contenttypes.models import ContentType
|
from django.contrib.contenttypes.models import ContentType
|
||||||
from django.contrib.contenttypes import generic
|
from django.contrib.contenttypes import generic
|
||||||
@@ -11,7 +11,6 @@ from django.contrib.contenttypes import generic
|
|||||||
from documents.models import Document
|
from documents.models import Document
|
||||||
|
|
||||||
from .managers import DocumentCheckoutManager
|
from .managers import DocumentCheckoutManager
|
||||||
from .exceptions import DocumentAlreadyCheckedOut
|
|
||||||
from .events import history_document_checked_out
|
from .events import history_document_checked_out
|
||||||
|
|
||||||
logger = logging.getLogger(__name__)
|
logger = logging.getLogger(__name__)
|
||||||
|
|||||||
@@ -10,4 +10,3 @@ PERMISSION_DOCUMENT_CHECKOUT = Permission.objects.register(namespace, 'checkout_
|
|||||||
PERMISSION_DOCUMENT_CHECKIN = Permission.objects.register(namespace, 'checkin_document', _(u'Check in documents'))
|
PERMISSION_DOCUMENT_CHECKIN = Permission.objects.register(namespace, 'checkin_document', _(u'Check in documents'))
|
||||||
PERMISSION_DOCUMENT_CHECKIN_OVERRIDE = Permission.objects.register(namespace, 'checkin_document_override', _(u'Forcefully check in documents'))
|
PERMISSION_DOCUMENT_CHECKIN_OVERRIDE = Permission.objects.register(namespace, 'checkin_document_override', _(u'Forcefully check in documents'))
|
||||||
PERMISSION_DOCUMENT_RESTRICTIONS_OVERRIDE = Permission.objects.register(namespace, 'checkout_restrictions_override', _(u'Allow overriding check out restrictions'))
|
PERMISSION_DOCUMENT_RESTRICTIONS_OVERRIDE = Permission.objects.register(namespace, 'checkout_restrictions_override', _(u'Allow overriding check out restrictions'))
|
||||||
|
|
||||||
|
|||||||
@@ -21,7 +21,6 @@ from .permissions import (PERMISSION_DOCUMENT_CHECKOUT, PERMISSION_DOCUMENT_CHEC
|
|||||||
PERMISSION_DOCUMENT_CHECKIN_OVERRIDE)
|
PERMISSION_DOCUMENT_CHECKIN_OVERRIDE)
|
||||||
from .forms import DocumentCheckoutForm
|
from .forms import DocumentCheckoutForm
|
||||||
from .exceptions import DocumentAlreadyCheckedOut, DocumentNotCheckedOut
|
from .exceptions import DocumentAlreadyCheckedOut, DocumentNotCheckedOut
|
||||||
from .literals import STATE_CHECKED_OUT, STATE_CHECKED_IN, STATE_ICONS, STATE_LABELS
|
|
||||||
from .widgets import checkout_widget
|
from .widgets import checkout_widget
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@@ -8,7 +8,7 @@ from django.utils.safestring import mark_safe
|
|||||||
from django.conf import settings
|
from django.conf import settings
|
||||||
from django.core import validators
|
from django.core import validators
|
||||||
|
|
||||||
from .literals import STATE_CHECKED_OUT, STATE_CHECKED_IN, STATE_ICONS, STATE_LABELS
|
from .literals import STATE_ICONS, STATE_LABELS
|
||||||
|
|
||||||
|
|
||||||
def checkout_widget(document):
|
def checkout_widget(document):
|
||||||
@@ -27,9 +27,9 @@ class SplitDeltaWidget(forms.widgets.MultiWidget):
|
|||||||
"""
|
"""
|
||||||
def __init__(self, attrs=None):
|
def __init__(self, attrs=None):
|
||||||
widgets = (
|
widgets = (
|
||||||
forms.widgets.TextInput(attrs={'maxlength': 3, 'style':'width: 5em;', 'placeholder': _(u'Days')}),
|
forms.widgets.TextInput(attrs={'maxlength': 3, 'style': 'width: 5em;', 'placeholder': _(u'Days')}),
|
||||||
forms.widgets.TextInput(attrs={'maxlength': 4, 'style':'width: 5em;', 'placeholder': _(u'Hours')}),
|
forms.widgets.TextInput(attrs={'maxlength': 4, 'style': 'width: 5em;', 'placeholder': _(u'Hours')}),
|
||||||
forms.widgets.TextInput(attrs={'maxlength': 5, 'style':'width: 5em;', 'placeholder': _(u'Minutes')}),
|
forms.widgets.TextInput(attrs={'maxlength': 5, 'style': 'width: 5em;', 'placeholder': _(u'Minutes')}),
|
||||||
)
|
)
|
||||||
super(SplitDeltaWidget, self).__init__(widgets, attrs)
|
super(SplitDeltaWidget, self).__init__(widgets, attrs)
|
||||||
|
|
||||||
@@ -49,7 +49,7 @@ class SplitHiddenDeltaWidget(forms.widgets.SplitDateTimeWidget):
|
|||||||
is_hidden = True
|
is_hidden = True
|
||||||
|
|
||||||
def __init__(self, attrs=None):
|
def __init__(self, attrs=None):
|
||||||
super(SplitHiddenDeltaWidget, self).__init__(attrs, date_format, time_format)
|
super(SplitHiddenDeltaWidget, self).__init__(attrs)
|
||||||
for widget in self.widgets:
|
for widget in self.widgets:
|
||||||
widget.input_type = 'hidden'
|
widget.input_type = 'hidden'
|
||||||
widget.is_hidden = True
|
widget.is_hidden = True
|
||||||
|
|||||||
@@ -7,7 +7,6 @@ from south.signals import post_migrate
|
|||||||
from django.utils.translation import ugettext_lazy as _
|
from django.utils.translation import ugettext_lazy as _
|
||||||
from django.contrib.auth import models as auth_models
|
from django.contrib.auth import models as auth_models
|
||||||
from django.contrib.auth.models import User
|
from django.contrib.auth.models import User
|
||||||
from django.contrib.auth.management import create_superuser
|
|
||||||
from django.dispatch import receiver
|
from django.dispatch import receiver
|
||||||
from django.conf import settings
|
from django.conf import settings
|
||||||
from django.db.models.signals import post_save
|
from django.db.models.signals import post_save
|
||||||
|
|||||||
@@ -1,5 +1,4 @@
|
|||||||
from django.template import Library
|
from django.template import Library
|
||||||
from django.utils.importlib import import_module
|
|
||||||
|
|
||||||
from common.models import AutoAdminSingleton
|
from common.models import AutoAdminSingleton
|
||||||
|
|
||||||
|
|||||||
@@ -1,7 +1,6 @@
|
|||||||
from __future__ import absolute_import
|
from __future__ import absolute_import
|
||||||
|
|
||||||
import os
|
import os
|
||||||
import subprocess
|
|
||||||
import hashlib
|
import hashlib
|
||||||
import logging
|
import logging
|
||||||
|
|
||||||
|
|||||||
@@ -6,11 +6,9 @@ import logging
|
|||||||
|
|
||||||
from mimetype.api import get_mimetype
|
from mimetype.api import get_mimetype
|
||||||
from common.conf.settings import TEMPORARY_DIRECTORY
|
from common.conf.settings import TEMPORARY_DIRECTORY
|
||||||
from common.utils import id_generator
|
|
||||||
|
|
||||||
from .conf.settings import LIBREOFFICE_PATH
|
from .conf.settings import LIBREOFFICE_PATH
|
||||||
from .exceptions import (OfficeConversionError,
|
from .exceptions import OfficeBackendError, UnknownFileFormat
|
||||||
OfficeBackendError, UnknownFileFormat)
|
|
||||||
|
|
||||||
CACHED_FILE_SUFFIX = u'_office_converter'
|
CACHED_FILE_SUFFIX = u'_office_converter'
|
||||||
|
|
||||||
|
|||||||
@@ -1,14 +1,10 @@
|
|||||||
from __future__ import absolute_import
|
from __future__ import absolute_import
|
||||||
|
|
||||||
from django.utils.translation import ugettext_lazy as _
|
from navigation.api import bind_links
|
||||||
|
|
||||||
from navigation.api import bind_links, Link
|
|
||||||
from project_setup.api import register_setup
|
from project_setup.api import register_setup
|
||||||
from hkp import Key as KeyServerKey
|
from hkp import Key as KeyServerKey
|
||||||
|
|
||||||
from .api import Key
|
from .api import Key
|
||||||
from .permissions import (PERMISSION_KEY_VIEW, PERMISSION_KEY_DELETE,
|
|
||||||
PERMISSION_KEYSERVER_QUERY, PERMISSION_KEY_RECEIVE)
|
|
||||||
from .links import (private_keys, public_keys, key_delete, key_query,
|
from .links import (private_keys, public_keys, key_delete, key_query,
|
||||||
key_receive, key_setup)
|
key_receive, key_setup)
|
||||||
|
|
||||||
|
|||||||
@@ -13,7 +13,7 @@ from common.utils import encapsulate
|
|||||||
|
|
||||||
from .api import Key
|
from .api import Key
|
||||||
from .runtime import gpg
|
from .runtime import gpg
|
||||||
from .exceptions import KeyFetchingError, KeyImportError
|
from .exceptions import KeyImportError
|
||||||
from .forms import KeySearchForm
|
from .forms import KeySearchForm
|
||||||
from .permissions import (PERMISSION_KEY_VIEW, PERMISSION_KEY_DELETE,
|
from .permissions import (PERMISSION_KEY_VIEW, PERMISSION_KEY_DELETE,
|
||||||
PERMISSION_KEYSERVER_QUERY, PERMISSION_KEY_RECEIVE)
|
PERMISSION_KEYSERVER_QUERY, PERMISSION_KEY_RECEIVE)
|
||||||
|
|||||||
@@ -5,7 +5,7 @@ from django.conf import settings
|
|||||||
from django.contrib.comments.models import Comment
|
from django.contrib.comments.models import Comment
|
||||||
from django.contrib.contenttypes import generic
|
from django.contrib.contenttypes import generic
|
||||||
|
|
||||||
from navigation.api import bind_links, register_model_list_columns, Link
|
from navigation.api import bind_links, register_model_list_columns
|
||||||
from common.utils import encapsulate
|
from common.utils import encapsulate
|
||||||
from acls.api import class_permissions
|
from acls.api import class_permissions
|
||||||
from documents.models import Document
|
from documents.models import Document
|
||||||
@@ -15,8 +15,7 @@ if 'django.contrib.comments' not in settings.INSTALLED_APPS:
|
|||||||
|
|
||||||
from .permissions import (PERMISSION_COMMENT_CREATE,
|
from .permissions import (PERMISSION_COMMENT_CREATE,
|
||||||
PERMISSION_COMMENT_DELETE, PERMISSION_COMMENT_VIEW)
|
PERMISSION_COMMENT_DELETE, PERMISSION_COMMENT_VIEW)
|
||||||
from .links import (comment_delete, comment_multiple_delete, comment_add,
|
from .links import (comment_delete, comment_add, comments_for_document)
|
||||||
comments_for_document)
|
|
||||||
|
|
||||||
register_model_list_columns(Comment, [
|
register_model_list_columns(Comment, [
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -2,18 +2,15 @@ from __future__ import absolute_import
|
|||||||
|
|
||||||
import logging
|
import logging
|
||||||
|
|
||||||
from django.db.models.signals import pre_save, post_save, pre_delete
|
|
||||||
from django.dispatch import receiver
|
from django.dispatch import receiver
|
||||||
from django.utils.translation import ugettext_lazy as _
|
from django.utils.translation import ugettext_lazy as _
|
||||||
from django.dispatch import receiver
|
|
||||||
from django.db.models.signals import post_save, pre_delete, post_delete
|
from django.db.models.signals import post_save, pre_delete, post_delete
|
||||||
|
|
||||||
from navigation.api import (register_top_menu, register_sidebar_template,
|
from navigation.api import (register_top_menu, register_sidebar_template,
|
||||||
bind_links, Link)
|
bind_links, Link)
|
||||||
|
|
||||||
from main.api import register_maintenance_links
|
from main.api import register_maintenance_links
|
||||||
from documents.models import Document, DocumentVersion
|
from documents.models import Document
|
||||||
from documents.permissions import PERMISSION_DOCUMENT_VIEW
|
|
||||||
from metadata.models import DocumentMetadata
|
from metadata.models import DocumentMetadata
|
||||||
from project_setup.api import register_setup
|
from project_setup.api import register_setup
|
||||||
|
|
||||||
@@ -22,14 +19,7 @@ from .api import update_indexes, delete_indexes
|
|||||||
from .links import (index_setup, index_setup_list, index_setup_create,
|
from .links import (index_setup, index_setup_list, index_setup_create,
|
||||||
index_setup_edit, index_setup_delete, index_setup_view,
|
index_setup_edit, index_setup_delete, index_setup_view,
|
||||||
template_node_create, template_node_edit, template_node_delete,
|
template_node_create, template_node_edit, template_node_delete,
|
||||||
index_list, index_parent, document_index_list, rebuild_index_instances)
|
index_parent, document_index_list, rebuild_index_instances)
|
||||||
from .permissions import (PERMISSION_DOCUMENT_INDEXING_VIEW,
|
|
||||||
PERMISSION_DOCUMENT_INDEXING_REBUILD_INDEXES,
|
|
||||||
PERMISSION_DOCUMENT_INDEXING_SETUP,
|
|
||||||
PERMISSION_DOCUMENT_INDEXING_CREATE,
|
|
||||||
PERMISSION_DOCUMENT_INDEXING_EDIT,
|
|
||||||
PERMISSION_DOCUMENT_INDEXING_DELETE
|
|
||||||
)
|
|
||||||
|
|
||||||
logger = logging.getLogger(__name__)
|
logger = logging.getLogger(__name__)
|
||||||
|
|
||||||
|
|||||||
@@ -7,12 +7,11 @@ try:
|
|||||||
except ImportError:
|
except ImportError:
|
||||||
from StringIO import StringIO
|
from StringIO import StringIO
|
||||||
|
|
||||||
from django.utils.translation import ugettext_lazy as _
|
|
||||||
#from django.db.models.signals import post_save
|
#from django.db.models.signals import post_save
|
||||||
#from django.dispatch import receiver
|
#from django.dispatch import receiver
|
||||||
|
|
||||||
from documents.models import Document, DocumentVersion
|
from documents.models import Document, DocumentVersion
|
||||||
from navigation.api import bind_links, Link
|
from navigation.api import bind_links
|
||||||
from django_gpg.runtime import gpg
|
from django_gpg.runtime import gpg
|
||||||
from django_gpg.exceptions import GPGDecryptionError
|
from django_gpg.exceptions import GPGDecryptionError
|
||||||
from acls.api import class_permissions
|
from acls.api import class_permissions
|
||||||
|
|||||||
@@ -2,7 +2,6 @@ from __future__ import absolute_import
|
|||||||
|
|
||||||
from django.utils.translation import ugettext_lazy as _
|
from django.utils.translation import ugettext_lazy as _
|
||||||
|
|
||||||
from documents.models import Document, DocumentVersion
|
|
||||||
from navigation.api import Link
|
from navigation.api import Link
|
||||||
|
|
||||||
from .models import DocumentVersionSignature
|
from .models import DocumentVersionSignature
|
||||||
|
|||||||
@@ -20,10 +20,7 @@ from .permissions import (PERMISSION_DOCUMENT_PROPERTIES_EDIT,
|
|||||||
PERMISSION_DOCUMENT_VIEW, PERMISSION_DOCUMENT_DELETE,
|
PERMISSION_DOCUMENT_VIEW, PERMISSION_DOCUMENT_DELETE,
|
||||||
PERMISSION_DOCUMENT_DOWNLOAD, PERMISSION_DOCUMENT_TRANSFORM,
|
PERMISSION_DOCUMENT_DOWNLOAD, PERMISSION_DOCUMENT_TRANSFORM,
|
||||||
PERMISSION_DOCUMENT_EDIT, PERMISSION_DOCUMENT_VERSION_REVERT,
|
PERMISSION_DOCUMENT_EDIT, PERMISSION_DOCUMENT_VERSION_REVERT,
|
||||||
PERMISSION_DOCUMENT_NEW_VERSION, PERMISSION_DOCUMENT_CREATE,
|
PERMISSION_DOCUMENT_NEW_VERSION)
|
||||||
PERMISSION_DOCUMENT_TOOLS)
|
|
||||||
from .conf.settings import ZOOM_MAX_LEVEL
|
|
||||||
from .conf.settings import ZOOM_MIN_LEVEL
|
|
||||||
from .conf import settings as document_settings
|
from .conf import settings as document_settings
|
||||||
from .widgets import document_thumbnail
|
from .widgets import document_thumbnail
|
||||||
from .links import (document_list, document_list_recent,
|
from .links import (document_list, document_list_recent,
|
||||||
|
|||||||
@@ -2,7 +2,6 @@ from __future__ import absolute_import
|
|||||||
|
|
||||||
import datetime
|
import datetime
|
||||||
|
|
||||||
from django.db import connection
|
|
||||||
from django.db import models
|
from django.db import models
|
||||||
from django.contrib.auth.models import User
|
from django.contrib.auth.models import User
|
||||||
from django.core.urlresolvers import reverse
|
from django.core.urlresolvers import reverse
|
||||||
|
|||||||
@@ -3,13 +3,11 @@ from __future__ import absolute_import
|
|||||||
from django.utils.translation import ugettext_lazy as _
|
from django.utils.translation import ugettext_lazy as _
|
||||||
|
|
||||||
from project_tools.api import register_tool
|
from project_tools.api import register_tool
|
||||||
from navigation.api import (bind_links, register_top_menu,
|
from navigation.api import bind_links, register_model_list_columns
|
||||||
register_model_list_columns,
|
|
||||||
register_sidebar_template, Link)
|
|
||||||
from common.utils import encapsulate
|
from common.utils import encapsulate
|
||||||
|
|
||||||
from .models import History
|
from .models import History
|
||||||
from .widgets import history_entry_summary, history_entry_type_link
|
from .widgets import history_entry_type_link
|
||||||
from .links import history_list, history_details
|
from .links import history_list, history_details
|
||||||
|
|
||||||
register_tool(history_list)
|
register_tool(history_list)
|
||||||
|
|||||||
@@ -5,7 +5,6 @@ import json
|
|||||||
|
|
||||||
from django.db import transaction
|
from django.db import transaction
|
||||||
from django.core import serializers
|
from django.core import serializers
|
||||||
from django.shortcuts import get_object_or_404
|
|
||||||
from django.db import models
|
from django.db import models
|
||||||
from django.db.utils import DatabaseError
|
from django.db.utils import DatabaseError
|
||||||
|
|
||||||
@@ -39,7 +38,6 @@ class Event(object):
|
|||||||
# Special case for syncdb
|
# Special case for syncdb
|
||||||
transaction.rollback()
|
transaction.rollback()
|
||||||
|
|
||||||
|
|
||||||
def commit(self, source_object=None, data=None):
|
def commit(self, source_object=None, data=None):
|
||||||
new_history = History(history_type=self.history_type_obj)
|
new_history = History(history_type=self.history_type_obj)
|
||||||
if source_object:
|
if source_object:
|
||||||
|
|||||||
@@ -16,7 +16,7 @@ from acls.models import AccessEntry
|
|||||||
from .models import History, HistoryType
|
from .models import History, HistoryType
|
||||||
from .forms import HistoryDetailForm
|
from .forms import HistoryDetailForm
|
||||||
from .permissions import PERMISSION_HISTORY_VIEW
|
from .permissions import PERMISSION_HISTORY_VIEW
|
||||||
from .widgets import history_entry_object_link, history_entry_summary
|
from .widgets import history_entry_object_link
|
||||||
|
|
||||||
|
|
||||||
def history_list(request, object_list=None, title=None, extra_context=None):
|
def history_list(request, object_list=None, title=None, extra_context=None):
|
||||||
|
|||||||
@@ -5,7 +5,6 @@ from south.signals import post_migrate
|
|||||||
from project_tools.api import register_tool
|
from project_tools.api import register_tool
|
||||||
|
|
||||||
from django.dispatch import receiver
|
from django.dispatch import receiver
|
||||||
from django.db.models.signals import post_save
|
|
||||||
from django.db.utils import DatabaseError
|
from django.db.utils import DatabaseError
|
||||||
from django.db import transaction
|
from django.db import transaction
|
||||||
|
|
||||||
|
|||||||
@@ -34,6 +34,7 @@ FORM_RECEIVER_FIELD = 'entry.0.single'
|
|||||||
TIMEOUT = 5
|
TIMEOUT = 5
|
||||||
FABFILE_MARKER = os.path.join(settings.PROJECT_ROOT, 'fabfile_install')
|
FABFILE_MARKER = os.path.join(settings.PROJECT_ROOT, 'fabfile_install')
|
||||||
|
|
||||||
|
|
||||||
class Property(object):
|
class Property(object):
|
||||||
def __init__(self, name, label, value):
|
def __init__(self, name, label, value):
|
||||||
self.name = name
|
self.name = name
|
||||||
@@ -64,10 +65,10 @@ class Installation(Singleton):
|
|||||||
self._properties = SortedDict()
|
self._properties = SortedDict()
|
||||||
if LSB:
|
if LSB:
|
||||||
self.add_property(Property('is_lsb', _(u'LSB OS'), True))
|
self.add_property(Property('is_lsb', _(u'LSB OS'), True))
|
||||||
self.add_property(Property('distributor_id', _(u'Distributor ID'), lsb_release('-i','-s')))
|
self.add_property(Property('distributor_id', _(u'Distributor ID'), lsb_release('-i', '-s')))
|
||||||
self.add_property(Property('description', _(u'Description'), lsb_release('-d','-s')))
|
self.add_property(Property('description', _(u'Description'), lsb_release('-d', '-s')))
|
||||||
self.add_property(Property('release', _(u'Release'), lsb_release('-r','-s')))
|
self.add_property(Property('release', _(u'Release'), lsb_release('-r', '-s')))
|
||||||
self.add_property(Property('codename', _(u'Codename'), lsb_release('-c','-s')))
|
self.add_property(Property('codename', _(u'Codename'), lsb_release('-c', '-s')))
|
||||||
self.add_property(Property('sysinfo', _(u'System info'), uname('-a')))
|
self.add_property(Property('sysinfo', _(u'System info'), uname('-a')))
|
||||||
else:
|
else:
|
||||||
self.add_property(Property('is_lsb', _(u'LSB OS'), False))
|
self.add_property(Property('is_lsb', _(u'LSB OS'), False))
|
||||||
@@ -117,7 +118,7 @@ class Installation(Singleton):
|
|||||||
try:
|
try:
|
||||||
return self._properties[name]
|
return self._properties[name]
|
||||||
except KeyError:
|
except KeyError:
|
||||||
raise AttributeError, name
|
raise AttributeError
|
||||||
|
|
||||||
def submit(self):
|
def submit(self):
|
||||||
try:
|
try:
|
||||||
@@ -174,6 +175,5 @@ class Installation(Singleton):
|
|||||||
finally:
|
finally:
|
||||||
lock.release()
|
lock.release()
|
||||||
|
|
||||||
|
|
||||||
class Meta:
|
class Meta:
|
||||||
verbose_name = verbose_name_plural = _(u'installation details')
|
verbose_name = verbose_name_plural = _(u'installation details')
|
||||||
|
|||||||
@@ -3,7 +3,6 @@ from __future__ import absolute_import
|
|||||||
from django.shortcuts import render_to_response
|
from django.shortcuts import render_to_response
|
||||||
from django.template import RequestContext
|
from django.template import RequestContext
|
||||||
from django.utils.translation import ugettext_lazy as _
|
from django.utils.translation import ugettext_lazy as _
|
||||||
from django.core.exceptions import PermissionDenied
|
|
||||||
|
|
||||||
from permissions.models import Permission
|
from permissions.models import Permission
|
||||||
|
|
||||||
|
|||||||
@@ -1,19 +1,15 @@
|
|||||||
from __future__ import absolute_import
|
from __future__ import absolute_import
|
||||||
|
|
||||||
from django.utils.translation import ugettext_lazy as _
|
from navigation.api import bind_links, register_sidebar_template
|
||||||
|
|
||||||
from navigation.api import bind_links, register_sidebar_template, Link
|
|
||||||
from project_setup.api import register_setup
|
from project_setup.api import register_setup
|
||||||
from documents.permissions import PERMISSION_DOCUMENT_VIEW
|
|
||||||
from documents.models import Document
|
from documents.models import Document
|
||||||
from acls.api import class_permissions
|
from acls.api import class_permissions
|
||||||
from acls.permissions import ACLS_EDIT_ACL, ACLS_VIEW_ACL
|
from acls.permissions import ACLS_EDIT_ACL, ACLS_VIEW_ACL
|
||||||
|
|
||||||
from .models import SmartLink, SmartLinkCondition
|
from .models import SmartLink, SmartLinkCondition
|
||||||
from .permissions import (PERMISSION_SMART_LINK_VIEW,
|
from .permissions import (PERMISSION_SMART_LINK_VIEW,
|
||||||
PERMISSION_SMART_LINK_CREATE, PERMISSION_SMART_LINK_DELETE,
|
PERMISSION_SMART_LINK_DELETE, PERMISSION_SMART_LINK_EDIT)
|
||||||
PERMISSION_SMART_LINK_EDIT)
|
from .links import (smart_link_instances_for_document,
|
||||||
from .links import (smart_link_instance_view_link, smart_link_instances_for_document,
|
|
||||||
smart_link_setup, smart_link_list, smart_link_create, smart_link_edit,
|
smart_link_setup, smart_link_list, smart_link_create, smart_link_edit,
|
||||||
smart_link_delete, smart_link_condition_list, smart_link_condition_create,
|
smart_link_delete, smart_link_condition_list, smart_link_condition_create,
|
||||||
smart_link_condition_edit, smart_link_condition_delete, smart_link_acl_list)
|
smart_link_condition_edit, smart_link_condition_delete, smart_link_acl_list)
|
||||||
|
|||||||
@@ -4,11 +4,10 @@ from django.utils.translation import ugettext_lazy as _
|
|||||||
|
|
||||||
from navigation.api import Link
|
from navigation.api import Link
|
||||||
from documents.permissions import PERMISSION_DOCUMENT_VIEW
|
from documents.permissions import PERMISSION_DOCUMENT_VIEW
|
||||||
from acls.permissions import ACLS_EDIT_ACL, ACLS_VIEW_ACL
|
from acls.permissions import ACLS_VIEW_ACL
|
||||||
|
|
||||||
from .permissions import (PERMISSION_SMART_LINK_VIEW,
|
from .permissions import (PERMISSION_SMART_LINK_CREATE,
|
||||||
PERMISSION_SMART_LINK_CREATE, PERMISSION_SMART_LINK_DELETE,
|
PERMISSION_SMART_LINK_DELETE, PERMISSION_SMART_LINK_EDIT)
|
||||||
PERMISSION_SMART_LINK_EDIT)
|
|
||||||
|
|
||||||
smart_link_instance_view_link = Link(text=_(u'smart links actions'), view='smart_link_instance_view', sprite='page_link', permissions=[PERMISSION_DOCUMENT_VIEW])
|
smart_link_instance_view_link = Link(text=_(u'smart links actions'), view='smart_link_instance_view', sprite='page_link', permissions=[PERMISSION_DOCUMENT_VIEW])
|
||||||
smart_link_instances_for_document = Link(text=_(u'smart links'), view='smart_link_instances_for_document', args='object.pk', sprite='page_link', permissions=[PERMISSION_DOCUMENT_VIEW])
|
smart_link_instances_for_document = Link(text=_(u'smart links'), view='smart_link_instances_for_document', args='object.pk', sprite='page_link', permissions=[PERMISSION_DOCUMENT_VIEW])
|
||||||
|
|||||||
@@ -24,7 +24,7 @@ from .models import SmartLink, SmartLinkCondition
|
|||||||
from .conf.settings import SHOW_EMPTY_SMART_LINKS
|
from .conf.settings import SHOW_EMPTY_SMART_LINKS
|
||||||
from .forms import (SmartLinkInstanceForm, SmartLinkForm,
|
from .forms import (SmartLinkInstanceForm, SmartLinkForm,
|
||||||
SmartLinkConditionForm)
|
SmartLinkConditionForm)
|
||||||
from . import smart_link_instance_view_link
|
from .links import smart_link_instance_view_link
|
||||||
from .permissions import (PERMISSION_SMART_LINK_VIEW,
|
from .permissions import (PERMISSION_SMART_LINK_VIEW,
|
||||||
PERMISSION_SMART_LINK_CREATE, PERMISSION_SMART_LINK_DELETE,
|
PERMISSION_SMART_LINK_CREATE, PERMISSION_SMART_LINK_DELETE,
|
||||||
PERMISSION_SMART_LINK_EDIT)
|
PERMISSION_SMART_LINK_EDIT)
|
||||||
|
|||||||
@@ -1,7 +1,5 @@
|
|||||||
from __future__ import absolute_import
|
from __future__ import absolute_import
|
||||||
|
|
||||||
from django.utils.translation import ugettext_lazy as _
|
|
||||||
|
|
||||||
from navigation.api import bind_links
|
from navigation.api import bind_links
|
||||||
from documents.models import Document
|
from documents.models import Document
|
||||||
from acls.api import class_permissions
|
from acls.api import class_permissions
|
||||||
|
|||||||
@@ -17,7 +17,6 @@ class DocumentMailForm(forms.Form):
|
|||||||
self.fields['subject'].initial = settings.LINK_SUBJECT_TEMPLATE
|
self.fields['subject'].initial = settings.LINK_SUBJECT_TEMPLATE
|
||||||
self.fields['body'].initial = settings.LINK_BODY_TEMPLATE
|
self.fields['body'].initial = settings.LINK_BODY_TEMPLATE
|
||||||
|
|
||||||
|
|
||||||
email = forms.EmailField(label=_(u'Email address'))
|
email = forms.EmailField(label=_(u'Email address'))
|
||||||
subject = forms.CharField(label=_(u'Subject'), required=False)#, initial=_(u'Link for document: {{ document }}'))
|
subject = forms.CharField(label=_(u'Subject'), required=False)
|
||||||
body = forms.CharField(label=_(u'Body'), widget=forms.widgets.Textarea(), required=False)#, initial=_(u'To access this document click on the following link: <a href="{{ link }}">{{ link }}</a>'))
|
body = forms.CharField(label=_(u'Body'), widget=forms.widgets.Textarea(), required=False)
|
||||||
|
|||||||
@@ -1,10 +1,8 @@
|
|||||||
from __future__ import absolute_import
|
from __future__ import absolute_import
|
||||||
|
|
||||||
from django.utils.translation import ugettext_lazy as _
|
from django.utils.translation import ugettext_lazy as _
|
||||||
from django.conf import settings
|
|
||||||
|
|
||||||
from navigation.api import Link, register_top_menu
|
from navigation.api import Link, register_top_menu
|
||||||
from project_setup.api import register_setup
|
|
||||||
from project_tools.api import register_tool
|
from project_tools.api import register_tool
|
||||||
|
|
||||||
from .conf.settings import SIDE_BAR_SEARCH, DISABLE_HOME_VIEW
|
from .conf.settings import SIDE_BAR_SEARCH, DISABLE_HOME_VIEW
|
||||||
|
|||||||
@@ -1,8 +1,8 @@
|
|||||||
from navigation.api import register_multi_item_links
|
from navigation.api import register_multi_item_links
|
||||||
|
|
||||||
from documents.links import document_multiple_clear_transformations, document_multiple_delete, document_multiple_download
|
from documents.links import document_multiple_clear_transformations, document_multiple_delete, document_multiple_download
|
||||||
from metadata import metadata_multiple_add, metadata_multiple_edit, metadata_multiple_remove
|
from metadata.links import metadata_multiple_add, metadata_multiple_edit, metadata_multiple_remove
|
||||||
from ocr import submit_document_multiple
|
from ocr.links import submit_document_multiple
|
||||||
|
|
||||||
|
|
||||||
def register_multi_items_links():
|
def register_multi_items_links():
|
||||||
|
|||||||
@@ -2,11 +2,10 @@ from __future__ import absolute_import
|
|||||||
|
|
||||||
from django.utils.translation import ugettext_lazy as _
|
from django.utils.translation import ugettext_lazy as _
|
||||||
|
|
||||||
from navigation.api import (bind_links, register_multi_item_links,
|
from navigation.api import (bind_links, register_sidebar_template,
|
||||||
register_sidebar_template, Link, register_model_list_columns)
|
register_model_list_columns)
|
||||||
from common.utils import encapsulate
|
from common.utils import encapsulate
|
||||||
from documents.models import Document, DocumentType
|
from documents.models import Document, DocumentType
|
||||||
from documents.permissions import PERMISSION_DOCUMENT_TYPE_EDIT
|
|
||||||
from project_setup.api import register_setup
|
from project_setup.api import register_setup
|
||||||
from acls.api import class_permissions
|
from acls.api import class_permissions
|
||||||
|
|
||||||
@@ -15,8 +14,7 @@ from .models import MetadataType, MetadataSet
|
|||||||
from .permissions import (PERMISSION_METADATA_DOCUMENT_EDIT,
|
from .permissions import (PERMISSION_METADATA_DOCUMENT_EDIT,
|
||||||
PERMISSION_METADATA_DOCUMENT_ADD, PERMISSION_METADATA_DOCUMENT_REMOVE,
|
PERMISSION_METADATA_DOCUMENT_ADD, PERMISSION_METADATA_DOCUMENT_REMOVE,
|
||||||
PERMISSION_METADATA_DOCUMENT_VIEW)
|
PERMISSION_METADATA_DOCUMENT_VIEW)
|
||||||
from .links import (metadata_edit, metadata_view, metadata_multiple_edit,
|
from .links import (metadata_edit, metadata_view, metadata_add, metadata_remove,
|
||||||
metadata_add, metadata_multiple_add, metadata_remove, metadata_multiple_remove,
|
|
||||||
setup_metadata_type_list, setup_metadata_type_edit, setup_metadata_type_delete,
|
setup_metadata_type_list, setup_metadata_type_edit, setup_metadata_type_delete,
|
||||||
setup_metadata_type_create, setup_metadata_set_list, setup_metadata_set_edit,
|
setup_metadata_type_create, setup_metadata_set_list, setup_metadata_set_edit,
|
||||||
setup_metadata_set_delete, setup_metadata_set_create, setup_metadata_set_members,
|
setup_metadata_set_delete, setup_metadata_set_create, setup_metadata_set_members,
|
||||||
|
|||||||
@@ -513,7 +513,6 @@ def setup_metadata_set_delete(request, metadata_set_id):
|
|||||||
'metadata_set': metadata_set, 'error': e})
|
'metadata_set': metadata_set, 'error': e})
|
||||||
return HttpResponseRedirect(previous)
|
return HttpResponseRedirect(previous)
|
||||||
|
|
||||||
|
|
||||||
context = {
|
context = {
|
||||||
'object_name': _(u'metadata set'),
|
'object_name': _(u'metadata set'),
|
||||||
'delete_view': True,
|
'delete_view': True,
|
||||||
|
|||||||
@@ -91,6 +91,7 @@ def get_multi_item_links(parser, token):
|
|||||||
return GetNavigationLinks(menu_name=menu_name, links_dict=multi_object_navigation, var_name=var_name)
|
return GetNavigationLinks(menu_name=menu_name, links_dict=multi_object_navigation, var_name=var_name)
|
||||||
|
|
||||||
|
|
||||||
|
# TODO: Fix flake8 warning apps/navigation/templatetags/navigation_tags.py:98: W802 undefined name 'get_context_object_navigation_links'
|
||||||
@register.inclusion_tag('generic_form_instance.html', takes_context=True)
|
@register.inclusion_tag('generic_form_instance.html', takes_context=True)
|
||||||
def get_multi_item_links_form(context):
|
def get_multi_item_links_form(context):
|
||||||
logger.debug('starting')
|
logger.debug('starting')
|
||||||
|
|||||||
@@ -9,7 +9,7 @@ from django.db.models.signals import post_save, post_syncdb
|
|||||||
from django.dispatch import receiver
|
from django.dispatch import receiver
|
||||||
from django.db.utils import DatabaseError
|
from django.db.utils import DatabaseError
|
||||||
|
|
||||||
from navigation.api import bind_links, register_multi_item_links, Link
|
from navigation.api import bind_links, register_multi_item_links
|
||||||
from documents.models import Document, DocumentVersion
|
from documents.models import Document, DocumentVersion
|
||||||
from main.api import register_maintenance_links
|
from main.api import register_maintenance_links
|
||||||
from project_tools.api import register_tool
|
from project_tools.api import register_tool
|
||||||
@@ -26,8 +26,7 @@ from . import models as ocr_models
|
|||||||
|
|
||||||
logger = logging.getLogger(__name__)
|
logger = logging.getLogger(__name__)
|
||||||
|
|
||||||
from .links import (submit_document, submit_document_multiple,
|
from .links import (submit_document, re_queue_multiple_document,
|
||||||
re_queue_document, re_queue_multiple_document, queue_document_delete,
|
|
||||||
queue_document_multiple_delete, document_queue_disable,
|
queue_document_multiple_delete, document_queue_disable,
|
||||||
document_queue_enable, all_document_ocr_cleanup, queue_document_list,
|
document_queue_enable, all_document_ocr_cleanup, queue_document_list,
|
||||||
ocr_tool_link, setup_queue_transformation_list,
|
ocr_tool_link, setup_queue_transformation_list,
|
||||||
|
|||||||
@@ -15,10 +15,9 @@ from documents.models import Document
|
|||||||
from converter.api import get_available_transformations_choices
|
from converter.api import get_available_transformations_choices
|
||||||
from sources.managers import SourceTransformationManager
|
from sources.managers import SourceTransformationManager
|
||||||
|
|
||||||
from .literals import (DOCUMENTQUEUE_STATE_STOPPED,
|
from .literals import (DOCUMENTQUEUE_STATE_CHOICES,
|
||||||
DOCUMENTQUEUE_STATE_CHOICES, QUEUEDOCUMENT_STATE_PENDING,
|
QUEUEDOCUMENT_STATE_PENDING, QUEUEDOCUMENT_STATE_CHOICES,
|
||||||
QUEUEDOCUMENT_STATE_CHOICES, QUEUEDOCUMENT_STATE_PROCESSING,
|
QUEUEDOCUMENT_STATE_PROCESSING, DOCUMENTQUEUE_STATE_ACTIVE)
|
||||||
DOCUMENTQUEUE_STATE_ACTIVE)
|
|
||||||
from .managers import DocumentQueueManager
|
from .managers import DocumentQueueManager
|
||||||
from .exceptions import ReQueueError
|
from .exceptions import ReQueueError
|
||||||
|
|
||||||
|
|||||||
@@ -3,7 +3,6 @@ from __future__ import absolute_import
|
|||||||
from django.contrib.auth.models import User
|
from django.contrib.auth.models import User
|
||||||
from django.db.models.signals import post_save
|
from django.db.models.signals import post_save
|
||||||
from django.core.exceptions import ObjectDoesNotExist
|
from django.core.exceptions import ObjectDoesNotExist
|
||||||
from django.utils.translation import ugettext_lazy as _
|
|
||||||
|
|
||||||
from navigation.api import bind_links, register_multi_item_links
|
from navigation.api import bind_links, register_multi_item_links
|
||||||
from project_setup.api import register_setup
|
from project_setup.api import register_setup
|
||||||
|
|||||||
@@ -2,11 +2,6 @@ import logging
|
|||||||
|
|
||||||
from django.db import models
|
from django.db import models
|
||||||
from django.contrib.contenttypes.models import ContentType
|
from django.contrib.contenttypes.models import ContentType
|
||||||
from django.db import transaction
|
|
||||||
from django.core.exceptions import PermissionDenied
|
|
||||||
from django.shortcuts import get_object_or_404
|
|
||||||
from django.db.utils import IntegrityError
|
|
||||||
from django.core.exceptions import ImproperlyConfigured
|
|
||||||
|
|
||||||
from common.models import AnonymousUserSingleton
|
from common.models import AnonymousUserSingleton
|
||||||
|
|
||||||
|
|||||||
@@ -16,17 +16,16 @@ from django.contrib.auth.models import User, Group
|
|||||||
from django.utils.simplejson import loads
|
from django.utils.simplejson import loads
|
||||||
|
|
||||||
from common.views import assign_remove
|
from common.views import assign_remove
|
||||||
from common.utils import generate_choices_w_labels, encapsulate, get_object_name
|
from common.utils import encapsulate, get_object_name
|
||||||
from common.widgets import two_state_template
|
from common.widgets import two_state_template
|
||||||
from common.models import AnonymousUserSingleton
|
from common.models import AnonymousUserSingleton
|
||||||
from acls.classes import EncapsulatedObject
|
from acls.classes import EncapsulatedObject
|
||||||
|
|
||||||
from .models import Role, Permission, PermissionHolder, RoleMember
|
from .models import Role, Permission
|
||||||
from .forms import RoleForm, RoleForm_view
|
from .forms import RoleForm, RoleForm_view
|
||||||
from .permissions import (PERMISSION_ROLE_VIEW, PERMISSION_ROLE_EDIT,
|
from .permissions import (PERMISSION_ROLE_VIEW, PERMISSION_ROLE_EDIT,
|
||||||
PERMISSION_ROLE_CREATE, PERMISSION_ROLE_DELETE,
|
PERMISSION_ROLE_CREATE, PERMISSION_ROLE_DELETE,
|
||||||
PERMISSION_PERMISSION_GRANT, PERMISSION_PERMISSION_REVOKE)
|
PERMISSION_PERMISSION_GRANT, PERMISSION_PERMISSION_REVOKE)
|
||||||
from .widgets import role_permission_link
|
|
||||||
|
|
||||||
|
|
||||||
def role_list(request):
|
def role_list(request):
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
from __future__ import absolute_import
|
from __future__ import absolute_import
|
||||||
|
|
||||||
from elementtree.ElementTree import Element, SubElement
|
from elementtree.ElementTree import SubElement
|
||||||
|
|
||||||
from . import setup_menu
|
from . import setup_menu
|
||||||
|
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
from __future__ import absolute_import
|
from __future__ import absolute_import
|
||||||
|
|
||||||
from elementtree.ElementTree import Element, SubElement
|
from elementtree.ElementTree import SubElement
|
||||||
|
|
||||||
from . import tool_menu
|
from . import tool_menu
|
||||||
|
|
||||||
|
|||||||
@@ -3,7 +3,6 @@ from __future__ import absolute_import
|
|||||||
from django.shortcuts import render_to_response
|
from django.shortcuts import render_to_response
|
||||||
from django.template import RequestContext
|
from django.template import RequestContext
|
||||||
from django.utils.translation import ugettext_lazy as _
|
from django.utils.translation import ugettext_lazy as _
|
||||||
from django.core.exceptions import PermissionDenied
|
|
||||||
|
|
||||||
from permissions.models import Permission
|
from permissions.models import Permission
|
||||||
from common.utils import encapsulate
|
from common.utils import encapsulate
|
||||||
|
|||||||
@@ -1,7 +1,5 @@
|
|||||||
from __future__ import absolute_import
|
from __future__ import absolute_import
|
||||||
|
|
||||||
from django.utils.translation import ugettext_lazy as _
|
|
||||||
|
|
||||||
from project_setup.api import register_setup
|
from project_setup.api import register_setup
|
||||||
|
|
||||||
from .links import check_settings
|
from .links import check_settings
|
||||||
|
|||||||
@@ -3,11 +3,9 @@ from __future__ import absolute_import
|
|||||||
from django.utils.translation import ugettext_lazy as _
|
from django.utils.translation import ugettext_lazy as _
|
||||||
|
|
||||||
from navigation.api import (bind_links,
|
from navigation.api import (bind_links,
|
||||||
register_model_list_columns, Link)
|
register_model_list_columns)
|
||||||
from common.utils import encapsulate
|
from common.utils import encapsulate
|
||||||
from project_setup.api import register_setup
|
from project_setup.api import register_setup
|
||||||
from documents.permissions import (PERMISSION_DOCUMENT_NEW_VERSION,
|
|
||||||
PERMISSION_DOCUMENT_CREATE)
|
|
||||||
from scheduler.api import register_interval_job
|
from scheduler.api import register_interval_job
|
||||||
from documents.models import Document
|
from documents.models import Document
|
||||||
|
|
||||||
@@ -15,18 +13,15 @@ from .staging import StagingFile
|
|||||||
from .models import (WebForm, StagingFolder, SourceTransformation,
|
from .models import (WebForm, StagingFolder, SourceTransformation,
|
||||||
WatchFolder, POP3Email, IMAPEmail)
|
WatchFolder, POP3Email, IMAPEmail)
|
||||||
from .widgets import staging_file_thumbnail
|
from .widgets import staging_file_thumbnail
|
||||||
from .permissions import (PERMISSION_SOURCES_SETUP_VIEW,
|
|
||||||
PERMISSION_SOURCES_SETUP_EDIT, PERMISSION_SOURCES_SETUP_DELETE,
|
|
||||||
PERMISSION_SOURCES_SETUP_CREATE)
|
|
||||||
from .tasks import task_fetch_pop3_emails, task_fetch_imap_emails
|
from .tasks import task_fetch_pop3_emails, task_fetch_imap_emails
|
||||||
from .conf.settings import EMAIL_PROCESSING_INTERVAL
|
from .conf.settings import EMAIL_PROCESSING_INTERVAL
|
||||||
from .links import (staging_file_preview, staging_file_delete, setup_sources,
|
from .links import (staging_file_delete, setup_sources,
|
||||||
setup_web_form_list, setup_staging_folder_list, setup_watch_folder_list,
|
setup_web_form_list, setup_staging_folder_list, setup_watch_folder_list,
|
||||||
setup_pop3_email_list, setup_imap_email_list, setup_source_edit,
|
setup_pop3_email_list, setup_imap_email_list, setup_source_edit,
|
||||||
setup_source_delete, setup_source_create, setup_source_log_list,
|
setup_source_delete, setup_source_create, setup_source_log_list,
|
||||||
setup_source_transformation_list, setup_source_transformation_create,
|
setup_source_transformation_list, setup_source_transformation_create,
|
||||||
setup_source_transformation_edit, setup_source_transformation_delete,
|
setup_source_transformation_edit, setup_source_transformation_delete,
|
||||||
source_list, upload_version, document_create_multiple)
|
upload_version, document_create_multiple)
|
||||||
|
|
||||||
bind_links([StagingFile], [staging_file_delete])
|
bind_links([StagingFile], [staging_file_delete])
|
||||||
|
|
||||||
|
|||||||
@@ -1,8 +1,6 @@
|
|||||||
"""Configuration options for the sources app"""
|
"""Configuration options for the sources app"""
|
||||||
import os
|
|
||||||
|
|
||||||
from django.utils.translation import ugettext_lazy as _
|
from django.utils.translation import ugettext_lazy as _
|
||||||
from django.conf import settings
|
|
||||||
|
|
||||||
from smart_settings.api import Setting, SettingNamespace
|
from smart_settings.api import Setting, SettingNamespace
|
||||||
|
|
||||||
|
|||||||
@@ -21,7 +21,6 @@ from django.contrib.contenttypes import generic
|
|||||||
from django.core.exceptions import ValidationError
|
from django.core.exceptions import ValidationError
|
||||||
from django.db import transaction
|
from django.db import transaction
|
||||||
from django.core.files import File
|
from django.core.files import File
|
||||||
from django.core.files.base import ContentFile
|
|
||||||
|
|
||||||
from converter.api import get_available_transformations_choices
|
from converter.api import get_available_transformations_choices
|
||||||
from converter.literals import DIMENSION_SEPARATOR
|
from converter.literals import DIMENSION_SEPARATOR
|
||||||
|
|||||||
@@ -1,12 +1,7 @@
|
|||||||
from __future__ import absolute_import
|
from __future__ import absolute_import
|
||||||
|
|
||||||
from datetime import timedelta, datetime
|
|
||||||
import platform
|
|
||||||
import logging
|
import logging
|
||||||
|
|
||||||
from django.db.models import Q
|
|
||||||
|
|
||||||
from job_processor.api import process_job
|
|
||||||
from lock_manager import Lock, LockError
|
from lock_manager import Lock, LockError
|
||||||
|
|
||||||
from .models import POP3Email, IMAPEmail
|
from .models import POP3Email, IMAPEmail
|
||||||
|
|||||||
@@ -7,16 +7,15 @@ from navigation.api import (bind_links, register_top_menu,
|
|||||||
from common.utils import encapsulate
|
from common.utils import encapsulate
|
||||||
from documents.models import Document
|
from documents.models import Document
|
||||||
from acls.api import class_permissions
|
from acls.api import class_permissions
|
||||||
from acls.permissions import ACLS_VIEW_ACL
|
|
||||||
|
|
||||||
from taggit.models import Tag
|
from taggit.models import Tag
|
||||||
from taggit.managers import TaggableManager
|
from taggit.managers import TaggableManager
|
||||||
|
|
||||||
from .widgets import (get_tags_inline_widget_simple, single_tag_widget)
|
from .widgets import (get_tags_inline_widget_simple, single_tag_widget)
|
||||||
from .permissions import (PERMISSION_TAG_CREATE, PERMISSION_TAG_ATTACH,
|
from .permissions import (PERMISSION_TAG_ATTACH,
|
||||||
PERMISSION_TAG_REMOVE, PERMISSION_TAG_DELETE, PERMISSION_TAG_EDIT,
|
PERMISSION_TAG_REMOVE, PERMISSION_TAG_DELETE, PERMISSION_TAG_EDIT,
|
||||||
PERMISSION_TAG_VIEW)
|
PERMISSION_TAG_VIEW)
|
||||||
from .links import (tag_list, tag_create, tag_attach, tag_document_remove,
|
from .links import (tag_list, tag_create, tag_attach,
|
||||||
tag_document_remove_multiple, tag_document_list, tag_delete, tag_edit,
|
tag_document_remove_multiple, tag_document_list, tag_delete, tag_edit,
|
||||||
tag_tagged_item_list, tag_multiple_delete, tag_acl_list)
|
tag_tagged_item_list, tag_multiple_delete, tag_acl_list)
|
||||||
|
|
||||||
|
|||||||
@@ -6,8 +6,7 @@ from navigation.api import Link
|
|||||||
from acls.permissions import ACLS_VIEW_ACL
|
from acls.permissions import ACLS_VIEW_ACL
|
||||||
|
|
||||||
from .permissions import (PERMISSION_TAG_CREATE, PERMISSION_TAG_ATTACH,
|
from .permissions import (PERMISSION_TAG_CREATE, PERMISSION_TAG_ATTACH,
|
||||||
PERMISSION_TAG_REMOVE, PERMISSION_TAG_DELETE, PERMISSION_TAG_EDIT,
|
PERMISSION_TAG_REMOVE, PERMISSION_TAG_DELETE, PERMISSION_TAG_EDIT)
|
||||||
PERMISSION_TAG_VIEW)
|
|
||||||
|
|
||||||
tag_list = Link(text=_(u'tag list'), view='tag_list', sprite='tag_blue')
|
tag_list = Link(text=_(u'tag list'), view='tag_list', sprite='tag_blue')
|
||||||
tag_create = Link(text=_(u'create new tag'), view='tag_create', sprite='tag_blue_add', permissions=[PERMISSION_TAG_CREATE])
|
tag_create = Link(text=_(u'create new tag'), view='tag_create', sprite='tag_blue_add', permissions=[PERMISSION_TAG_CREATE])
|
||||||
|
|||||||
@@ -1,6 +1,5 @@
|
|||||||
from __future__ import absolute_import
|
from __future__ import absolute_import
|
||||||
|
|
||||||
from django.utils.translation import ugettext_lazy as _
|
|
||||||
from django.contrib.auth.models import User, Group
|
from django.contrib.auth.models import User, Group
|
||||||
|
|
||||||
from navigation.api import bind_links, register_multi_item_links
|
from navigation.api import bind_links, register_multi_item_links
|
||||||
|
|||||||
@@ -165,7 +165,6 @@ INSTALLED_APPS = (
|
|||||||
'mimetype',
|
'mimetype',
|
||||||
'scheduler',
|
'scheduler',
|
||||||
'job_processor',
|
'job_processor',
|
||||||
'installation',
|
|
||||||
# Mayan EDMS
|
# Mayan EDMS
|
||||||
'storage',
|
'storage',
|
||||||
'documents',
|
'documents',
|
||||||
@@ -180,12 +179,13 @@ INSTALLED_APPS = (
|
|||||||
'document_acls',
|
'document_acls',
|
||||||
'ocr',
|
'ocr',
|
||||||
'history',
|
'history',
|
||||||
'main',
|
|
||||||
'rest_api',
|
'rest_api',
|
||||||
'document_signatures',
|
'document_signatures',
|
||||||
#'workflows',
|
#'workflows',
|
||||||
'checkouts',
|
'checkouts',
|
||||||
'bootstrap',
|
#'bootstrap',
|
||||||
|
'main',
|
||||||
|
'installation',
|
||||||
|
|
||||||
# Has to be last so the other apps can register it's signals
|
# Has to be last so the other apps can register it's signals
|
||||||
'signaler',
|
'signaler',
|
||||||
|
|||||||
2
urls.py
2
urls.py
@@ -36,7 +36,7 @@ urlpatterns = patterns('',
|
|||||||
(r'^checkouts/', include('checkouts.urls')),
|
(r'^checkouts/', include('checkouts.urls')),
|
||||||
(r'^installation/', include('installation.urls')),
|
(r'^installation/', include('installation.urls')),
|
||||||
(r'^scheduler/', include('scheduler.urls')),
|
(r'^scheduler/', include('scheduler.urls')),
|
||||||
(r'^bootstrap/', include('bootstrap.urls')),
|
#(r'^bootstrap/', include('bootstrap.urls')),
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user