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

Various apps: Sort imports

Browse Source 
Run imports as per Mayan EDMS best practices.

Signed-off-by: Roberto Rosario <Roberto.Rosario@mayan-edms.com>
This commit is contained in:
Roberto Rosario
2018-12-06 01:09:37 -04:00
parent 8740707d1d
commit 55a30379bd
79 changed files with 1218 additions and 184 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
mayan/apps/acls/api_views.py
View File

@@ -2,7 +2,6 @@ from __future__ import absolute_import, unicode_literals
from django.contrib.contenttypes.models import ContentType
from django.shortcuts import get_object_or_404
from rest_framework import generics
from .models import AccessControlList

2
mayan/apps/acls/classes.py
View File

@@ -1,4 +1,4 @@
from __future__ import unicode_literals, absolute_import
from __future__ import absolute_import, unicode_literals
import logging

2
mayan/apps/acls/links.py
View File

@@ -6,7 +6,7 @@ from django.utils.translation import ugettext_lazy as _
from mayan.apps.navigation import Link
from .icons import icon_acl_list, icon_acl_new
from .permissions import permission_acl_view, permission_acl_edit
from .permissions import permission_acl_edit, permission_acl_view
def get_kwargs_factory(variable_name):

5
mayan/apps/acls/managers.py
View File

@@ -6,14 +6,15 @@ from django.contrib.contenttypes.models import ContentType
from django.core.exceptions import PermissionDenied
from django.db import models
from django.db.models import Q
from django.utils.translation import ugettext, ugettext_lazy as _
from django.utils.translation import ugettext
from django.utils.translation import ugettext_lazy as _
from mayan.apps.common.utils import return_attrib, return_related
from mayan.apps.permissions import Permission
from mayan.apps.permissions.models import StoredPermission
from .exceptions import PermissionNotValidForClass
from .classes import ModelPermission
from .exceptions import PermissionNotValidForClass
logger = logging.getLogger(__name__)

2
mayan/apps/acls/migrations/0001_initial.py
View File

@@ -1,7 +1,7 @@
# -*- coding: utf-8 -*-
from __future__ import unicode_literals
from django.db import models, migrations
from django.db import migrations, models
class Migration(migrations.Migration):

2
mayan/apps/acls/migrations/0002_auto_20150703_0513.py
View File

@@ -1,7 +1,7 @@
# -*- coding: utf-8 -*-
from __future__ import unicode_literals
from django.db import models, migrations
from django.db import migrations, models
class Migration(migrations.Migration):

4
mayan/apps/acls/serializers.py
View File

@@ -12,7 +12,9 @@ from rest_framework.reverse import reverse
from mayan.apps.common.serializers import ContentTypeSerializer
from mayan.apps.permissions import Permission
from mayan.apps.permissions.models import Role, StoredPermission
from mayan.apps.permissions.serializers import PermissionSerializer, RoleSerializer
from mayan.apps.permissions.serializers import (
PermissionSerializer, RoleSerializer
)
from .models import AccessControlList

2
mayan/apps/acls/tests/test_links.py
View File

@@ -6,7 +6,7 @@ from django.urls import reverse
from mayan.apps.documents.tests import GenericDocumentViewTestCase
from ..links import (
link_acl_delete, link_acl_list, link_acl_create, link_acl_permissions
link_acl_create, link_acl_delete, link_acl_list, link_acl_permissions
)
from ..models import AccessControlList
from ..permissions import permission_acl_edit, permission_acl_view

4
mayan/apps/acls/tests/test_models.py
View File

@@ -7,8 +7,8 @@ from mayan.apps.common.tests import BaseTestCase
from mayan.apps.documents.models import Document, DocumentType
from mayan.apps.documents.permissions import permission_document_view
from mayan.apps.documents.tests import (
TEST_SMALL_DOCUMENT_PATH, TEST_DOCUMENT_TYPE_LABEL,
TEST_DOCUMENT_TYPE_2_LABEL
TEST_DOCUMENT_TYPE_2_LABEL, TEST_DOCUMENT_TYPE_LABEL,
TEST_SMALL_DOCUMENT_PATH
)
from ..models import AccessControlList

2
mayan/apps/acls/views.py
View File

@@ -15,7 +15,7 @@ from mayan.apps.common.views import (
AssignRemoveView, SingleObjectCreateView, SingleObjectDeleteView,
SingleObjectListView
)
from mayan.apps.permissions import PermissionNamespace, Permission
from mayan.apps.permissions import Permission, PermissionNamespace
from mayan.apps.permissions.models import StoredPermission
from .classes import ModelPermission

4
mayan/apps/authentication/tests/test_views.py
View File

@@ -8,8 +8,8 @@ from django.urls import reverse
from mayan.apps.common.tests import GenericViewTestCase
from mayan.apps.smart_settings.classes import Namespace
from mayan.apps.user_management.tests.literals import (
TEST_ADMIN_EMAIL, TEST_ADMIN_PASSWORD, TEST_USER_PASSWORD_EDITED,
TEST_ADMIN_USERNAME
TEST_ADMIN_EMAIL, TEST_ADMIN_PASSWORD, TEST_ADMIN_USERNAME,
TEST_USER_PASSWORD_EDITED
)
from ..settings import setting_maximum_session_length

1
mayan/apps/authentication/urls.py
View File

@@ -10,7 +10,6 @@ from .views import (
password_reset_done_view, password_reset_view
)
urlpatterns = [
url(r'^login/$', login_view, name='login_view'),
url(

8
mayan/apps/authentication/views.py
View File

@@ -4,8 +4,8 @@ from django.conf import settings
from django.contrib import messages
from django.contrib.auth import REDIRECT_FIELD_NAME
from django.contrib.auth.views import (
login, password_change, password_reset, password_reset_confirm,
password_reset_complete, password_reset_done
login, password_change, password_reset, password_reset_complete,
password_reset_confirm, password_reset_done
)
from django.http import HttpResponseRedirect
from django.shortcuts import redirect, resolve_url
@@ -16,7 +16,9 @@ from django.utils.translation import ugettext_lazy as _
from stronghold.decorators import public
import mayan
from mayan.apps.common.settings import setting_project_title, setting_project_url
from mayan.apps.common.settings import (
setting_project_title, setting_project_url
)
from .forms import EmailAuthenticationForm, UsernameAuthenticationForm
from .settings import setting_login_method, setting_maximum_session_length

4
mayan/apps/cabinets/admin.py
View File

@@ -2,10 +2,10 @@ from __future__ import unicode_literals
from django.contrib import admin
from .models import Cabinet
from mptt.admin import MPTTModelAdmin
from .models import Cabinet
@admin.register(Cabinet)
class CabinetAdmin(MPTTModelAdmin):

15
mayan/apps/cabinets/apps.py
View File

@@ -4,7 +4,9 @@ from django.apps import apps
from django.utils.translation import ugettext_lazy as _
from mayan.apps.acls import ModelPermission
from mayan.apps.acls.permissions import permission_acl_edit, permission_acl_view
from mayan.apps.acls.permissions import (
permission_acl_edit, permission_acl_view
)
from mayan.apps.common import (
MayanAppConfig, menu_facet, menu_main, menu_multi_item, menu_object,
menu_sidebar
@@ -13,12 +15,11 @@ from mayan.apps.documents.search import document_page_search, document_search
from mayan.apps.navigation import SourceColumn
from .links import (
link_cabinet_list, link_document_cabinet_list,
link_document_cabinet_remove, link_cabinet_add_document,
link_cabinet_add_multiple_documents, link_cabinet_child_add,
link_cabinet_create, link_cabinet_delete, link_cabinet_edit,
link_cabinet_view, link_custom_acl_list,
link_multiple_document_cabinet_remove
link_cabinet_add_document, link_cabinet_add_multiple_documents,
link_cabinet_child_add, link_cabinet_create, link_cabinet_delete,
link_cabinet_edit, link_cabinet_list, link_cabinet_view,
link_custom_acl_list, link_document_cabinet_list,
link_document_cabinet_remove, link_multiple_document_cabinet_remove
)
from .menus import menu_cabinets
from .permissions import (

2
mayan/apps/cabinets/links.py
View File

@@ -15,7 +15,7 @@ from .icons import (
from .permissions import (
permission_cabinet_add_document, permission_cabinet_create,
permission_cabinet_delete, permission_cabinet_edit,
permission_cabinet_view, permission_cabinet_remove_document
permission_cabinet_remove_document, permission_cabinet_view
)
# Document links

4
mayan/apps/cabinets/migrations/0001_initial.py
View File

@@ -1,9 +1,9 @@
# -*- coding: utf-8 -*-
# Generated by Django 1.10.5 on 2017-01-24 07:37
from __future__ import unicode_literals
from django.db import migrations, models
import django.db.models.deletion
from django.db import migrations, models
import mptt.fields

3
mayan/apps/cabinets/tests/test_views.py
View File

@@ -8,7 +8,8 @@ from ..permissions import (
permission_cabinet_delete, permission_cabinet_edit,
permission_cabinet_remove_document, permission_cabinet_view
)
from .literals import TEST_CABINET_LABEL, TEST_CABINET_EDITED_LABEL
from .literals import TEST_CABINET_EDITED_LABEL, TEST_CABINET_LABEL
class CabinetViewTestCase(GenericDocumentViewTestCase):

2
mayan/apps/cabinets/tests/test_wizard_steps.py
View File

@@ -3,7 +3,7 @@ from __future__ import unicode_literals
from mayan.apps.documents.models import Document
from mayan.apps.documents.permissions import permission_document_create
from mayan.apps.documents.tests import (
GenericDocumentViewTestCase, TEST_SMALL_DOCUMENT_PATH,
TEST_SMALL_DOCUMENT_PATH, GenericDocumentViewTestCase
)
from mayan.apps.sources.models import WebFormSource
from mayan.apps.sources.tests.literals import (

9
mayan/apps/cabinets/urls.py
View File

@@ -3,13 +3,14 @@ from __future__ import unicode_literals
from django.conf.urls import url
from .api_views import (
APIDocumentCabinetListView, APICabinetDocumentListView,
APICabinetDocumentView, APICabinetListView, APICabinetView
APICabinetDocumentListView, APICabinetDocumentView, APICabinetListView,
APICabinetView, APIDocumentCabinetListView
)
from .views import (
CabinetChildAddView, CabinetCreateView, CabinetDeleteView,
CabinetDetailView, CabinetEditView, CabinetListView,
DocumentAddToCabinetView, DocumentCabinetListView,
DocumentRemoveFromCabinetView, CabinetChildAddView, CabinetCreateView,
CabinetDeleteView, CabinetDetailView, CabinetEditView, CabinetListView,
DocumentRemoveFromCabinetView
)
urlpatterns = [

7
mayan/apps/cabinets/views.py
View File

@@ -6,15 +6,16 @@ from django.contrib import messages
from django.shortcuts import get_object_or_404
from django.template import RequestContext
from django.urls import reverse_lazy
from django.utils.translation import ugettext_lazy as _, ungettext
from django.utils.translation import ugettext_lazy as _
from django.utils.translation import ungettext
from mayan.apps.acls.models import AccessControlList
from mayan.apps.common.views import (
MultipleObjectFormActionView, SingleObjectCreateView,
SingleObjectDeleteView, SingleObjectEditView, SingleObjectListView
)
from mayan.apps.documents.permissions import permission_document_view
from mayan.apps.documents.models import Document
from mayan.apps.documents.permissions import permission_document_view
from mayan.apps.documents.views import DocumentListView
from .forms import CabinetListForm
@@ -26,7 +27,7 @@ from .models import Cabinet
from .permissions import (
permission_cabinet_add_document, permission_cabinet_create,
permission_cabinet_delete, permission_cabinet_edit,
permission_cabinet_view, permission_cabinet_remove_document
permission_cabinet_remove_document, permission_cabinet_view
)
from .widgets import jstree_data

6
mayan/apps/checkouts/apps.py
View File

@@ -9,7 +9,9 @@ from django.db.models.signals import pre_save
from django.utils.translation import ugettext_lazy as _
from mayan.apps.acls import ModelPermission
from mayan.apps.common import MayanAppConfig, menu_facet, menu_main, menu_sidebar
from mayan.apps.common import (
MayanAppConfig, menu_facet, menu_main, menu_sidebar
)
from mayan.apps.common.dashboards import dashboard_main
from mayan.apps.events import ModelEventType
from mayan.celery import app
@@ -30,8 +32,8 @@ from .permissions import (
permission_document_checkout, permission_document_checkout_detail_view
)
from .queues import * # NOQA
from .tasks import task_check_expired_check_outs # NOQA
# This import is required so that celerybeat can find the task
from .tasks import task_check_expired_check_outs # NOQA
class CheckoutsApp(MayanAppConfig):

4
mayan/apps/checkouts/links.py
View File

@@ -6,8 +6,8 @@ from mayan.apps.navigation import Link
from .icons import icon_checkout_info
from .permissions import (
permission_document_checkout, permission_document_checkin,
permission_document_checkin_override
permission_document_checkin, permission_document_checkin_override,
permission_document_checkout
)

2
mayan/apps/checkouts/managers.py
View File

@@ -13,7 +13,7 @@ from .events import (
event_document_forceful_check_in
)
from .exceptions import DocumentNotCheckedOut
from .literals import STATE_CHECKED_OUT, STATE_CHECKED_IN
from .literals import STATE_CHECKED_IN, STATE_CHECKED_OUT
logger = logging.getLogger(__name__)

2
mayan/apps/checkouts/migrations/0001_initial.py
View File

@@ -1,7 +1,7 @@
# -*- coding: utf-8 -*-
from __future__ import unicode_literals
from django.db import models, migrations
from django.db import migrations, models
class Migration(migrations.Migration):

2
mayan/apps/checkouts/migrations/0002_documentcheckout_user.py
View File

@@ -1,8 +1,8 @@
# -*- coding: utf-8 -*-
from __future__ import unicode_literals
from django.db import models, migrations
from django.conf import settings
from django.db import migrations, models
class Migration(migrations.Migration):

2
mayan/apps/checkouts/migrations/0004_auto_20150617_0330.py
View File

@@ -1,8 +1,8 @@
# -*- coding: utf-8 -*-
from __future__ import unicode_literals
from django.db import models, migrations
from django.conf import settings
from django.db import migrations, models
class Migration(migrations.Migration):

2
mayan/apps/checkouts/migrations/0006_newversionblock.py
View File

@@ -2,8 +2,8 @@
# Generated by Django 1.9.11 on 2016-12-22 05:34
from __future__ import unicode_literals
from django.db import migrations, models
import django.db.models.deletion
from django.db import migrations, models
class Migration(migrations.Migration):

2
mayan/apps/checkouts/tests/test_api.py
View File

@@ -8,8 +8,8 @@ from django.utils.timezone import now
from rest_framework import status
from mayan.apps.documents.tests import DocumentTestMixin
from mayan.apps.documents.permissions import permission_document_view
from mayan.apps.documents.tests import DocumentTestMixin
from mayan.apps.rest_api.tests import BaseAPITestCase
from ..models import DocumentCheckout

4
mayan/apps/checkouts/tests/test_views.py
View File

@@ -9,8 +9,8 @@ from mayan.apps.common.literals import TIME_DELTA_UNIT_DAYS
from mayan.apps.documents.tests import GenericDocumentViewTestCase
from mayan.apps.sources.links import link_upload_version
from mayan.apps.user_management.tests import (
TEST_USER_PASSWORD, TEST_USER_USERNAME, TEST_ADMIN_PASSWORD,
TEST_ADMIN_USERNAME,
TEST_ADMIN_PASSWORD, TEST_ADMIN_USERNAME, TEST_USER_PASSWORD,
TEST_USER_USERNAME
)
from ..models import DocumentCheckout

2
mayan/apps/checkouts/urls.py
View File

@@ -4,7 +4,7 @@ from django.conf.urls import url
from .api_views import APICheckedoutDocumentListView, APICheckedoutDocumentView
from .views import (
CheckoutDocumentView, CheckoutDetailView, CheckoutListView,
CheckoutDetailView, CheckoutDocumentView, CheckoutListView,
DocumentCheckinView
)

2
mayan/apps/checkouts/views.py
View File

@@ -15,7 +15,7 @@ from mayan.apps.documents.models import Document
from mayan.apps.documents.views import DocumentListView
from .exceptions import DocumentAlreadyCheckedOut, DocumentNotCheckedOut
from .forms import DocumentCheckoutForm, DocumentCheckoutDefailForm
from .forms import DocumentCheckoutDefailForm, DocumentCheckoutForm
from .icons import icon_checkout_info
from .models import DocumentCheckout
from .permissions import (

13
mayan/apps/common/apps.py
View File

@@ -1,9 +1,9 @@
from __future__ import absolute_import, unicode_literals
from datetime import timedelta
import logging
import os
import warnings
from datetime import timedelta
from kombu import Exchange, Queue
@@ -19,21 +19,18 @@ from mayan.celery import app
from .classes import Template
from .handlers import (
handler_pre_initial_setup, handler_pre_upgrade,
user_locale_profile_session_config, user_locale_profile_create
handler_pre_initial_setup, handler_pre_upgrade, user_locale_profile_create,
user_locale_profile_session_config
)
from .licenses import * # NOQA
from .links import (
link_about, link_check_version, link_current_user_details,
link_current_user_edit, link_current_user_locale_profile_edit,
link_license, link_object_error_list_clear, link_packages_licenses,
link_setup, link_tools, separator_user_label, text_user_label
)
from .literals import DELETE_STALE_UPLOADS_INTERVAL, MESSAGE_SQLITE_WARNING
from .menus import (
menu_about, menu_main, menu_secondary, menu_user
)
from .licenses import * # NOQA
from .menus import menu_about, menu_main, menu_secondary, menu_user
from .queues import * # NOQA - Force queues registration
from .settings import (
setting_auto_logging, setting_production_error_log_path,

1
mayan/apps/common/compressed_files.py
View File

@@ -3,7 +3,6 @@ from __future__ import unicode_literals
from io import BytesIO
import tarfile
import zipfile
try:
import zlib # NOQA
COMPRESSION = zipfile.ZIP_DEFLATED

7
mayan/apps/common/generics.py
View File

@@ -7,9 +7,9 @@ from django.core.exceptions import ImproperlyConfigured
from django.http import HttpResponseRedirect
from django.utils.encoding import force_text
from django.utils.translation import ugettext_lazy as _
from django.views.generic import (
FormView as DjangoFormView, DetailView, TemplateView
)
from django.views.generic import DetailView
from django.views.generic import FormView as DjangoFormView
from django.views.generic import TemplateView
from django.views.generic.detail import SingleObjectMixin
from django.views.generic.edit import (
CreateView, DeleteView, FormMixin, ModelFormMixin, UpdateView
@@ -29,7 +29,6 @@ from .mixins import (
ObjectListPermissionFilterMixin, ObjectNameMixin,
ObjectPermissionCheckMixin, RedirectionMixin, ViewPermissionCheckMixin
)
from .settings import setting_paginate_by
__all__ = (

7
mayan/apps/common/links.py
View File

@@ -9,10 +9,9 @@ from mayan.apps.navigation.classes import Separator, Text
from .icons import (
icon_about, icon_check_version, icon_current_user_details,
icon_current_user_edit, icon_current_user_locale_profile_details,
icon_current_user_locale_profile_edit, icon_documentation,
icon_forum, icon_license, icon_object_error_list_with_icon,
icon_packages_licenses, icon_setup, icon_source_code, icon_support,
icon_tools
icon_current_user_locale_profile_edit, icon_documentation, icon_forum,
icon_license, icon_object_error_list_with_icon, icon_packages_licenses,
icon_setup, icon_source_code, icon_support, icon_tools
)
from .permissions_runtime import permission_error_log_view
from .utils import get_user_label_text

2
mayan/apps/common/migrations/0001_initial.py
View File

@@ -1,9 +1,9 @@
# -*- coding: utf-8 -*-
from __future__ import unicode_literals
from django.db import models, migrations
from django.conf import settings
from django.core.files.storage import FileSystemStorage
from django.db import migrations, models
import mayan.apps.common.models

2
mayan/apps/common/migrations/0002_auto_20150608_1902.py
View File

@@ -1,7 +1,7 @@
# -*- coding: utf-8 -*-
from __future__ import unicode_literals
from django.db import models, migrations
from django.db import migrations, models
class Migration(migrations.Migration):

1
mayan/apps/common/migrations/0003_auto_20150614_0723.py
View File

@@ -1,4 +1,3 @@
# -*- coding: utf-8 -*-
from __future__ import unicode_literals
from django.db import migrations

1
mayan/apps/common/migrations/0004_delete_anonymoususersingleton.py
View File

@@ -1,4 +1,3 @@
# -*- coding: utf-8 -*-
from __future__ import unicode_literals
from django.db import migrations

1
mayan/apps/common/migrations/0005_auto_20150706_1832.py
View File

@@ -1,4 +1,3 @@
# -*- coding: utf-8 -*-
from __future__ import unicode_literals
from django.db import migrations

501
mayan/apps/common/migrations/0007_auto_20170118_1758.py
View File

File diff suppressed because one or more lines are too long

43
mayan/apps/common/migrations/0008_errorlogentry.py
View File

@@ -2,8 +2,8 @@
# Generated by Django 1.10.7 on 2017-08-25 06:52
from __future__ import unicode_literals
from django.db import migrations, models
import django.db.models.deletion
from django.db import migrations, models
class Migration(migrations.Migration):
@@ -17,12 +17,41 @@ class Migration(migrations.Migration):
migrations.CreateModel(
name='ErrorLogEntry',
fields=[
('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
('namespace', models.CharField(max_length=128, verbose_name='Namespace')),
('object_id', models.PositiveIntegerField(blank=True, null=True)),
('datetime', models.DateTimeField(auto_now_add=True, db_index=True, verbose_name='Date time')),
('result', models.TextField(blank=True, null=True, verbose_name='Result')),
('content_type', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, related_name='error_log_content_type', to='contenttypes.ContentType')),
(
'id', models.AutoField(
auto_created=True, primary_key=True, serialize=False,
verbose_name='ID'
)
),
(
'namespace', models.CharField(
max_length=128, verbose_name='Namespace'
)
),
(
'object_id', models.PositiveIntegerField(
blank=True, null=True
)
),
(
'datetime', models.DateTimeField(
auto_now_add=True, db_index=True,
verbose_name='Date time'
)
),
(
'result', models.TextField(
blank=True, null=True, verbose_name='Result'
)
),
(
'content_type', models.ForeignKey(
blank=True, null=True,
on_delete=django.db.models.deletion.CASCADE,
related_name='error_log_content_type',
to='contenttypes.ContentType'
)
),
],
options={
'ordering': ('datetime',),

445
mayan/apps/common/migrations/0009_auto_20180402_0339.py
View File

File diff suppressed because one or more lines are too long

12
mayan/apps/common/migrations/0010_auto_20180403_0702.py
View File

@@ -1,11 +1,10 @@
# -*- coding: utf-8 -*-
# Generated by Django 1.11.11 on 2018-04-03 07:02
from __future__ import unicode_literals
import mayan.apps.common.models
import django.core.files.storage
from django.db import migrations, models
import mayan.apps.common.models
class Migration(migrations.Migration):
@@ -17,6 +16,11 @@ class Migration(migrations.Migration):
migrations.AlterField(
model_name='shareduploadedfile',
name='file',
field=models.FileField(storage=django.core.files.storage.FileSystemStorage(location=b'mayan/media/shared_files'), upload_to=mayan.apps.common.models.upload_to, verbose_name='File'),
field=models.FileField(
storage=django.core.files.storage.FileSystemStorage(
location=b'mayan/media/shared_files'
), upload_to=mayan.apps.common.models.upload_to,
verbose_name='File'
),
),
]

12
mayan/apps/common/migrations/0011_auto_20180429_0758.py
View File

@@ -1,11 +1,10 @@
# -*- coding: utf-8 -*-
# Generated by Django 1.11.11 on 2018-04-29 07:58
from __future__ import unicode_literals
import mayan.apps.common.models
import django.core.files.storage
from django.db import migrations, models
import mayan.apps.common.models
class Migration(migrations.Migration):
@@ -17,6 +16,11 @@ class Migration(migrations.Migration):
migrations.AlterField(
model_name='shareduploadedfile',
name='file',
field=models.FileField(storage=django.core.files.storage.FileSystemStorage(location=b'/home/rosarior/development/mayan-edms/mayan/media/shared_files'), upload_to=mayan.apps.common.models.upload_to, verbose_name='File'),
field=models.FileField(
storage=django.core.files.storage.FileSystemStorage(
location=b'/home/rosarior/development/mayan-edms/mayan/media/shared_files'
), upload_to=mayan.apps.common.models.upload_to,
verbose_name='File'
),
),
]

91
mayan/apps/common/migrations/0012_auto_20181203_0812.py
View File

@@ -1,9 +1,7 @@
# -*- coding: utf-8 -*-
# Generated by Django 1.11.16 on 2018-12-03 08:12
from __future__ import unicode_literals
from django.db import migrations, models
import django.db.models.deletion
from django.db import migrations, models
class Migration(migrations.Migration):
@@ -16,11 +14,33 @@ class Migration(migrations.Migration):
migrations.CreateModel(
name='Cache',
fields=[
('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
('name', models.CharField(max_length=128, unique=True, verbose_name='Name')),
('label', models.CharField(max_length=128, verbose_name='Label')),
('maximum_size', models.PositiveIntegerField(verbose_name='Maximum size')),
('storage_instance_path', models.CharField(max_length=255, unique=True, verbose_name='Storage instance path')),
(
'id', models.AutoField(
auto_created=True, primary_key=True, serialize=False,
verbose_name='ID'
)
),
(
'name', models.CharField(
max_length=128, unique=True, verbose_name='Name'
)
),
(
'label', models.CharField(
max_length=128, verbose_name='Label'
)
),
(
'maximum_size', models.PositiveIntegerField(
verbose_name='Maximum size'
)
),
(
'storage_instance_path', models.CharField(
max_length=255, unique=True,
verbose_name='Storage instance path'
)
),
],
options={
'verbose_name': 'Cache',
@@ -30,9 +50,24 @@ class Migration(migrations.Migration):
migrations.CreateModel(
name='CachePartition',
fields=[
('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
('name', models.CharField(max_length=128, verbose_name='Name')),
('cache', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='partitions', to='common.Cache', verbose_name='Cache')),
(
'id', models.AutoField(
auto_created=True, primary_key=True, serialize=False,
verbose_name='ID'
)
),
(
'name', models.CharField(
max_length=128, verbose_name='Name'
)
),
(
'cache', models.ForeignKey(
on_delete=django.db.models.deletion.CASCADE,
related_name='partitions', to='common.Cache',
verbose_name='Cache'
)
),
],
options={
'verbose_name': 'Cache partition',
@@ -42,11 +77,35 @@ class Migration(migrations.Migration):
migrations.CreateModel(
name='CachePartitionFile',
fields=[
('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
('datetime', models.DateTimeField(auto_now_add=True, db_index=True, verbose_name='Date time')),
('filename', models.CharField(max_length=255, verbose_name='Filename')),
('file_size', models.PositiveIntegerField(default=0, verbose_name='File size')),
('partition', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='files', to='common.CachePartition', verbose_name='Cache partition')),
(
'id', models.AutoField(
auto_created=True, primary_key=True, serialize=False,
verbose_name='ID'
)
),
(
'datetime', models.DateTimeField(
auto_now_add=True, db_index=True,
verbose_name='Date time'
)
),
(
'filename', models.CharField(
max_length=255, verbose_name='Filename'
)
),
(
'file_size', models.PositiveIntegerField(
default=0, verbose_name='File size'
)
),
(
'partition', models.ForeignKey(
on_delete=django.db.models.deletion.CASCADE,
related_name='files', to='common.CachePartition',
verbose_name='Cache partition'
)
),
],
options={
'get_latest_by': 'datetime',

3
mayan/apps/common/mixins.py
View File

@@ -6,7 +6,8 @@ from django.core.exceptions import PermissionDenied
from django.db.models.query import QuerySet
from django.http import HttpResponseRedirect
from django.shortcuts import resolve_url
from django.utils.translation import ungettext, ugettext_lazy as _
from django.utils.translation import ugettext_lazy as _
from django.utils.translation import ungettext
from mayan.apps.acls.models import AccessControlList
from mayan.apps.permissions import Permission

4
mayan/apps/common/storages.py
View File

@@ -2,9 +2,7 @@ from __future__ import unicode_literals
from django.utils.module_loading import import_string
from .settings import (
setting_shared_storage, setting_shared_storage_arguments
)
from .settings import setting_shared_storage, setting_shared_storage_arguments
storage_sharedupload = import_string(
dotted_path=setting_shared_storage.value

2
mayan/apps/common/tasks.py
View File

@@ -1,7 +1,7 @@
from __future__ import unicode_literals
from datetime import timedelta
import logging
from datetime import timedelta
from django.apps import apps
from django.utils.timezone import now

5
mayan/apps/common/tests/base.py
View File

@@ -7,14 +7,13 @@ from django.template import Context, Template
from django.test import TestCase
from django.test.utils import ContextList
from django.urls import clear_url_caches, reverse
from django_downloadview import assert_download_response
from mayan.apps.permissions.classes import Permission
from mayan.apps.smart_settings.classes import Namespace
from mayan.apps.user_management.tests import (
TEST_ADMIN_PASSWORD, TEST_ADMIN_USERNAME, TEST_USER_USERNAME,
TEST_USER_PASSWORD
TEST_ADMIN_PASSWORD, TEST_ADMIN_USERNAME, TEST_USER_PASSWORD,
TEST_USER_USERNAME
)
from .literals import TEST_VIEW_NAME, TEST_VIEW_URL

5
mayan/apps/common/tests/mixins.py
View File

@@ -12,8 +12,9 @@ from mayan.apps.acls.models import AccessControlList
from mayan.apps.permissions.models import Role
from mayan.apps.permissions.tests.literals import TEST_ROLE_LABEL
from mayan.apps.user_management.tests import (
TEST_ADMIN_PASSWORD, TEST_ADMIN_USERNAME, TEST_ADMIN_EMAIL,
TEST_GROUP_NAME, TEST_USER_EMAIL, TEST_USER_USERNAME, TEST_USER_PASSWORD
TEST_ADMIN_EMAIL, TEST_ADMIN_PASSWORD, TEST_ADMIN_USERNAME,
TEST_GROUP_NAME, TEST_USER_EMAIL, TEST_USER_PASSWORD,
TEST_USER_USERNAME
)
from ..settings import setting_temporary_directory

2
mayan/apps/common/tests/test_api.py
View File

@@ -1,7 +1,7 @@
from __future__ import unicode_literals
from django.urls import reverse
from django.test import override_settings
from django.urls import reverse
from mayan.apps.rest_api.tests import BaseAPITestCase

2
mayan/apps/common/tests/test_compressed_files.py
View File

@@ -5,7 +5,7 @@ from mayan.apps.common.tests import BaseTestCase
from ..compressed_files import Archive, TarArchive, ZipArchive
from .literals import (
TEST_COMPRESSED_FILE_CONTENTS, TEST_FILE_CONTENTS_1, TEST_FILE3_PATH,
TEST_COMPRESSED_FILE_CONTENTS, TEST_FILE3_PATH, TEST_FILE_CONTENTS_1,
TEST_FILENAME1, TEST_FILENAME3, TEST_TAR_BZ2_FILE_PATH,
TEST_TAR_FILE_PATH, TEST_TAR_GZ_FILE_PATH, TEST_ZIP_FILE_PATH
)

8
mayan/apps/common/utils.py
View File

@@ -10,10 +10,10 @@ from django.conf import settings
from django.urls import resolve as django_resolve
from django.urls.base import get_script_prefix
from django.utils.datastructures import MultiValueDict
from django.utils.http import (
urlencode as django_urlencode, urlquote as django_urlquote
)
from django.utils.six.moves import reduce as reduce_function, xmlrpc_client
from django.utils.http import urlencode as django_urlencode
from django.utils.http import urlquote as django_urlquote
from django.utils.six.moves import reduce as reduce_function
from django.utils.six.moves import xmlrpc_client
from django.utils.translation import ugettext_lazy as _
import mayan

11
mayan/apps/common/views.py
View File

@@ -23,14 +23,13 @@ from .forms import (
)
from .generics import ( # NOQA
AssignRemoveView, ConfirmView, FormView, MultiFormView,
MultipleObjectConfirmActionView, MultipleObjectFormActionView,
SingleObjectCreateView, SingleObjectDeleteView,
SingleObjectDetailView, SingleObjectDynamicFormCreateView,
SingleObjectDynamicFormEditView, SingleObjectDownloadView,
SingleObjectEditView, SingleObjectListView, SimpleView
MultipleObjectConfirmActionView, MultipleObjectFormActionView, SimpleView,
SingleObjectCreateView, SingleObjectDeleteView, SingleObjectDetailView,
SingleObjectDownloadView, SingleObjectDynamicFormCreateView,
SingleObjectDynamicFormEditView, SingleObjectEditView, SingleObjectListView
)
from .icons import icon_setup
from .menus import menu_tools, menu_setup
from .menus import menu_setup, menu_tools
from .permissions_runtime import permission_error_log_view
from .utils import check_version

3
mayan/apps/common/widgets.py
View File

@@ -5,7 +5,8 @@ from django.utils.encoding import force_text
from django.utils.html import format_html
from django.utils.safestring import mark_safe
from .icons import icon_fail as default_icon_fail, icon_ok as default_icon_ok
from .icons import icon_fail as default_icon_fail
from .icons import icon_ok as default_icon_ok
class DisableableSelectWidget(forms.SelectMultiple):

3
mayan/apps/sources/admin.py
View File

@@ -3,7 +3,8 @@ from __future__ import unicode_literals
from django.contrib import admin
from .models import (
IMAPEmail, POP3Email, StagingFolderSource, WatchFolderSource, WebFormSource
IMAPEmail, POP3Email, StagingFolderSource, WatchFolderSource,
WebFormSource
)

14
mayan/apps/sources/apps.py
View File

@@ -6,7 +6,7 @@ from kombu import Exchange, Queue
from mayan.apps.common import (
MayanAppConfig, MissingItem, menu_list_facet, menu_object, menu_secondary,
menu_sidebar, menu_setup
menu_setup, menu_sidebar
)
from mayan.apps.common.signals import post_initial_setup, post_upgrade
from mayan.apps.converter.links import link_transformation_list
@@ -21,13 +21,13 @@ from .handlers import (
initialize_periodic_tasks
)
from .links import (
link_document_create_multiple, link_setup_sources,
link_setup_source_check_now, link_setup_source_create_imap_email,
link_setup_source_create_pop3_email, link_setup_source_create_sane_scanner,
link_document_create_multiple, link_setup_source_check_now,
link_setup_source_create_imap_email, link_setup_source_create_pop3_email,
link_setup_source_create_sane_scanner,
link_setup_source_create_staging_folder,
link_setup_source_create_watch_folder, link_setup_source_create_webform,
link_setup_source_create_staging_folder, link_setup_source_delete,
link_setup_source_edit, link_setup_source_logs, link_staging_file_delete,
link_upload_version
link_setup_source_delete, link_setup_source_edit, link_setup_source_logs,
link_setup_sources, link_staging_file_delete, link_upload_version
)
from .queues import * # NOQA
from .widgets import StagingFileThumbnailWidget

4
mayan/apps/sources/forms.py
View File

@@ -10,8 +10,8 @@ from django.utils.translation import ugettext_lazy as _
from mayan.apps.documents.forms import DocumentForm
from .models import (
IMAPEmail, POP3Email, SaneScanner, StagingFolderSource, WebFormSource,
WatchFolderSource
IMAPEmail, POP3Email, SaneScanner, StagingFolderSource, WatchFolderSource,
WebFormSource
)
logger = logging.getLogger(__name__)

5
mayan/apps/sources/links.py
View File

@@ -13,8 +13,9 @@ from .icons import (
icon_source_create
)
from .literals import (
SOURCE_CHOICE_WEB_FORM, SOURCE_CHOICE_EMAIL_IMAP, SOURCE_CHOICE_EMAIL_POP3,
SOURCE_CHOICE_SANE_SCANNER, SOURCE_CHOICE_STAGING, SOURCE_CHOICE_WATCH
SOURCE_CHOICE_EMAIL_IMAP, SOURCE_CHOICE_EMAIL_POP3,
SOURCE_CHOICE_SANE_SCANNER, SOURCE_CHOICE_STAGING, SOURCE_CHOICE_WATCH,
SOURCE_CHOICE_WEB_FORM
)
from .permissions import (
permission_sources_setup_create, permission_sources_setup_delete,

2
mayan/apps/sources/migrations/0001_initial.py
View File

@@ -1,7 +1,7 @@
# -*- coding: utf-8 -*-
from __future__ import unicode_literals
from django.db import models, migrations
from django.db import migrations, models
class Migration(migrations.Migration):

2
mayan/apps/sources/migrations/0003_sourcelog.py
View File

@@ -1,7 +1,7 @@
# -*- coding: utf-8 -*-
from __future__ import unicode_literals
from django.db import models, migrations
from django.db import migrations, models
class Migration(migrations.Migration):

2
mayan/apps/sources/migrations/0006_auto_20150708_0330.py
View File

@@ -1,7 +1,7 @@
# -*- coding: utf-8 -*-
from __future__ import unicode_literals
from django.db import models, migrations
from django.db import migrations, models
class Migration(migrations.Migration):

2
mayan/apps/sources/migrations/0007_emailbasemodel_metadata_attachment_name.py
View File

@@ -1,7 +1,7 @@
# -*- coding: utf-8 -*-
from __future__ import unicode_literals
from django.db import models, migrations
from django.db import migrations, models
class Migration(migrations.Migration):

2
mayan/apps/sources/migrations/0008_auto_20150815_0351.py
View File

@@ -1,7 +1,7 @@
# -*- coding: utf-8 -*-
from __future__ import unicode_literals
from django.db import models, migrations
from django.db import migrations, models
class Migration(migrations.Migration):

2
mayan/apps/sources/migrations/0009_auto_20150930_2341.py
View File

@@ -1,7 +1,7 @@
# -*- coding: utf-8 -*-
from __future__ import unicode_literals
from django.db import models, migrations
from django.db import migrations, models
class Migration(migrations.Migration):

2
mayan/apps/sources/migrations/0010_auto_20151001_0055.py
View File

@@ -1,7 +1,7 @@
# -*- coding: utf-8 -*-
from __future__ import unicode_literals
from django.db import models, migrations
from django.db import migrations, models
class Migration(migrations.Migration):

2
mayan/apps/sources/migrations/0011_sanescanner.py
View File

@@ -2,8 +2,8 @@
# Generated by Django 1.10.5 on 2017-02-05 04:19
from __future__ import unicode_literals
from django.db import migrations, models
import django.db.models.deletion
from django.db import migrations, models
class Migration(migrations.Migration):

16
mayan/apps/sources/models.py
View File

@@ -19,7 +19,7 @@ from django.utils.encoding import (
from django.utils.timezone import now
from django.utils.translation import ugettext_lazy as _
from djcelery.models import PeriodicTask, IntervalSchedule
from djcelery.models import IntervalSchedule, PeriodicTask
from model_utils.managers import InheritanceManager
from mayan.apps.common.compressed_files import Archive
@@ -34,14 +34,14 @@ from mayan.apps.metadata.models import MetadataType
from .classes import PseudoFile, SourceUploadedFile, StagingFile
from .exceptions import SourceException
from .literals import (
DEFAULT_INTERVAL, DEFAULT_POP3_TIMEOUT, DEFAULT_IMAP_MAILBOX,
DEFAULT_METADATA_ATTACHMENT_NAME, SCANNER_ADF_MODE_CHOICES,
SCANNER_MODE_COLOR, SCANNER_MODE_CHOICES, SCANNER_SOURCE_CHOICES,
SOURCE_CHOICES, SOURCE_CHOICE_STAGING, SOURCE_CHOICE_WATCH,
SOURCE_CHOICE_WEB_FORM, SOURCE_INTERACTIVE_UNCOMPRESS_CHOICES,
SOURCE_UNCOMPRESS_CHOICES, SOURCE_UNCOMPRESS_CHOICE_N,
SOURCE_UNCOMPRESS_CHOICE_Y, SOURCE_CHOICE_EMAIL_IMAP,
DEFAULT_IMAP_MAILBOX, DEFAULT_INTERVAL, DEFAULT_METADATA_ATTACHMENT_NAME,
DEFAULT_POP3_TIMEOUT, SCANNER_ADF_MODE_CHOICES, SCANNER_MODE_CHOICES,
SCANNER_MODE_COLOR, SCANNER_SOURCE_CHOICES, SOURCE_CHOICE_EMAIL_IMAP,
SOURCE_CHOICE_EMAIL_POP3, SOURCE_CHOICE_SANE_SCANNER,
SOURCE_CHOICE_STAGING, SOURCE_CHOICE_WATCH, SOURCE_CHOICE_WEB_FORM,
SOURCE_CHOICES, SOURCE_INTERACTIVE_UNCOMPRESS_CHOICES,
SOURCE_UNCOMPRESS_CHOICE_N, SOURCE_UNCOMPRESS_CHOICE_Y,
SOURCE_UNCOMPRESS_CHOICES
)
from .settings import setting_scanimage_path
from .wizards import WizardStep

2
mayan/apps/sources/storages.py
View File

@@ -4,7 +4,7 @@ from django.utils.module_loading import import_string
from .settings import (
setting_staging_file_image_cache_storage,
setting_staging_file_image_cache_storage_arguments,
setting_staging_file_image_cache_storage_arguments
)
storage_staging_file_image_cache = import_string(

3
mayan/apps/sources/tasks.py
View File

@@ -7,12 +7,11 @@ from django.db import OperationalError
from django.utils.encoding import force_text
from django.utils.translation import ugettext_lazy as _
from mayan.celery import app
from mayan.apps.common.compressed_files import Archive
from mayan.apps.common.exceptions import NoMIMETypeMatch
from mayan.apps.lock_manager import LockError
from mayan.apps.lock_manager.runtime import locking_backend
from mayan.celery import app
from .literals import (
DEFAULT_SOURCE_LOCK_EXPIRE, DEFAULT_SOURCE_TASK_RETRY_DELAY

2
mayan/apps/sources/tests/test_links.py
View File

@@ -1,7 +1,7 @@
from __future__ import unicode_literals
from mayan.apps.documents.tests import GenericDocumentViewTestCase
from mayan.apps.documents.permissions import permission_document_create
from mayan.apps.documents.tests import GenericDocumentViewTestCase
from ..links import link_document_create_multiple

8
mayan/apps/sources/tests/test_models.py
View File

@@ -8,13 +8,13 @@ from pathlib2 import Path
from django.test import override_settings
from django.utils.encoding import force_text
from mayan.apps.common.utils import mkdtemp
from mayan.apps.common.tests import BaseTestCase
from mayan.apps.common.utils import mkdtemp
from mayan.apps.documents.models import Document, DocumentType
from mayan.apps.documents.tests import (
DocumentTestMixin, TEST_COMPRESSED_DOCUMENT_PATH, TEST_DOCUMENT_TYPE_LABEL,
TEST_NON_ASCII_DOCUMENT_FILENAME, TEST_NON_ASCII_DOCUMENT_PATH,
TEST_NON_ASCII_COMPRESSED_DOCUMENT_PATH
TEST_COMPRESSED_DOCUMENT_PATH, TEST_DOCUMENT_TYPE_LABEL,
TEST_NON_ASCII_COMPRESSED_DOCUMENT_PATH, TEST_NON_ASCII_DOCUMENT_FILENAME,
TEST_NON_ASCII_DOCUMENT_PATH, DocumentTestMixin
)
from mayan.apps.metadata.models import MetadataType

6
mayan/apps/sources/tests/test_views.py
View File

@@ -11,9 +11,9 @@ from mayan.apps.common.utils import fs_cleanup, mkdtemp
from mayan.apps.documents.models import Document, DocumentType
from mayan.apps.documents.permissions import permission_document_create
from mayan.apps.documents.tests import (
GenericDocumentViewTestCase, TEST_DOCUMENT_DESCRIPTION,
TEST_DOCUMENT_TYPE_LABEL, TEST_SMALL_DOCUMENT_CHECKSUM,
TEST_SMALL_DOCUMENT_PATH,
TEST_DOCUMENT_DESCRIPTION, TEST_DOCUMENT_TYPE_LABEL,
TEST_SMALL_DOCUMENT_CHECKSUM, TEST_SMALL_DOCUMENT_PATH,
GenericDocumentViewTestCase
)
from ..links import link_upload_version

2
mayan/apps/sources/urls.py
View File

@@ -3,7 +3,7 @@ from __future__ import unicode_literals
from django.conf.urls import url
from .api_views import (
APIStagingSourceFileView, APIStagingSourceFileImageView,
APIStagingSourceFileImageView, APIStagingSourceFileView,
APIStagingSourceListView, APIStagingSourceView
)
from .views import (

2
mayan/apps/sources/utils.py
View File

@@ -1,5 +1,5 @@
from .forms import (
POP3EmailSetupForm, IMAPEmailSetupForm, SaneScannerSetupForm,
IMAPEmailSetupForm, POP3EmailSetupForm, SaneScannerSetupForm,
SaneScannerUploadForm, StagingFolderSetupForm, StagingUploadForm,
WatchFolderSetupForm, WebFormSetupForm, WebFormUploadForm
)

16
mayan/apps/sources/views.py
View File

@@ -18,11 +18,11 @@ from mayan.apps.common import menu_facet
from mayan.apps.common.models import SharedUploadedFile
from mayan.apps.common.utils import encapsulate
from mayan.apps.common.views import (
ConfirmView, MultiFormView, SingleObjectCreateView,
SingleObjectDeleteView, SingleObjectEditView, SingleObjectListView
ConfirmView, MultiFormView, SingleObjectCreateView, SingleObjectDeleteView,
SingleObjectEditView, SingleObjectListView
)
from mayan.apps.common.widgets import TwoStateWidget
from mayan.apps.documents.models import DocumentType, Document
from mayan.apps.documents.models import Document, DocumentType
from mayan.apps.documents.permissions import (
permission_document_create, permission_document_new_version
)
@@ -34,16 +34,14 @@ from .forms import (
NewDocumentForm, NewVersionForm, WebFormUploadForm, WebFormUploadFormHTML5
)
from .icons import icon_log, icon_setup_sources, icon_upload_view_link
from .literals import SOURCE_UNCOMPRESS_CHOICE_ASK, SOURCE_UNCOMPRESS_CHOICE_Y
from .links import (
link_setup_source_create_imap_email, link_setup_source_create_pop3_email,
link_setup_source_create_sane_scanner,
link_setup_source_create_staging_folder,
link_setup_source_create_watch_folder, link_setup_source_create_webform,
link_setup_source_create_sane_scanner
)
from .models import (
InteractiveSource, Source, SaneScanner, StagingFolderSource
link_setup_source_create_watch_folder, link_setup_source_create_webform
)
from .literals import SOURCE_UNCOMPRESS_CHOICE_ASK, SOURCE_UNCOMPRESS_CHOICE_Y
from .models import InteractiveSource, SaneScanner, Source, StagingFolderSource
from .permissions import (
permission_sources_setup_create, permission_sources_setup_delete,
permission_sources_setup_edit, permission_sources_setup_view,

4
mayan/apps/sources/widgets.py
View File

@@ -3,8 +3,8 @@ from __future__ import unicode_literals
from django.template.loader import render_to_string
from mayan.apps.documents.settings import (
setting_preview_width, setting_preview_height, setting_thumbnail_width,
setting_thumbnail_height
setting_preview_height, setting_preview_width, setting_thumbnail_height,
setting_thumbnail_width
)