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

Multiple apps: Sort imports and minor style fixes

Browse Source 
Signed-off-by: Roberto Rosario <Roberto.Rosario@mayan-edms.com>
This commit is contained in:
Roberto Rosario
2018-12-06 16:38:24 -04:00
parent 4d84b5f28f
commit 46cd7353dc
117 changed files with 500 additions and 346 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
mayan/apps/linking/apps.py
View File

@@ -5,7 +5,9 @@ from django.utils.translation import ugettext_lazy as _
from mayan.apps.acls import ModelPermission
from mayan.apps.acls.links import link_acl_list
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_list_facet, menu_object, menu_secondary,
menu_setup, menu_sidebar
@@ -14,9 +16,9 @@ from mayan.apps.common.widgets import TwoStateWidget
from mayan.apps.navigation import SourceColumn
from .links import (
link_smart_link_create, link_smart_link_condition_create,
link_smart_link_condition_delete, link_smart_link_condition_edit,
link_smart_link_condition_list, link_smart_link_delete,
link_smart_link_condition_create, link_smart_link_condition_delete,
link_smart_link_condition_edit, link_smart_link_condition_list,
link_smart_link_create, link_smart_link_delete,
link_smart_link_document_types, link_smart_link_edit,
link_smart_link_instance_view, link_smart_link_instances_for_document,
link_smart_link_list, link_smart_link_setup

3
mayan/apps/linking/migrations/0001_initial.py
View File

@@ -1,7 +1,6 @@
# -*- 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/linking/migrations/0002_resolvedsmartlink.py
View File

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

1
mayan/apps/linking/migrations/0003_auto_20150708_0318.py
View File

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

3
mayan/apps/linking/migrations/0004_auto_20150708_0320.py
View File

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

3
mayan/apps/linking/migrations/0005_auto_20150729_2344.py
View File

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

11
mayan/apps/linking/migrations/0006_auto_20180402_0339.py
View File

@@ -1,5 +1,3 @@
# -*- coding: utf-8 -*-
# Generated by Django 1.11.11 on 2018-04-02 03:39
from __future__ import unicode_literals
from django.db import migrations, models
@@ -14,11 +12,16 @@ class Migration(migrations.Migration):
operations = [
migrations.AlterModelOptions(
name='smartlink',
options={'ordering': ('label',), 'verbose_name': 'Smart link', 'verbose_name_plural': 'Smart links'},
options={
'ordering': ('label',), 'verbose_name': 'Smart link',
'verbose_name_plural': 'Smart links'
},
),
migrations.AlterField(
model_name='smartlink',
name='label',
field=models.CharField(db_index=True, max_length=96, verbose_name='Label'),
field=models.CharField(
db_index=True, max_length=96, verbose_name='Label'
),
),
]

17
mayan/apps/linking/migrations/0007_auto_20180823_2353.py
View File

@@ -1,5 +1,3 @@
# -*- coding: utf-8 -*-
# Generated by Django 1.11.11 on 2018-08-23 23:53
from __future__ import unicode_literals
from django.db import migrations, models
@@ -15,11 +13,22 @@ class Migration(migrations.Migration):
migrations.AlterField(
model_name='smartlink',
name='dynamic_label',
field=models.CharField(blank=True, help_text="Enter a template to render. Use Django's default templating language (https://docs.djangoproject.com/en/1.11/ref/templates/builtins/). The {{ document }} context variable is available.", max_length=96, verbose_name='Dynamic label'),
field=models.CharField(
blank=True, help_text="Enter a template to render. Use "
"Django's default templating language "
"(https://docs.djangoproject.com/en/1.11/ref/templates/"
"builtins/). The {{ document }} context variable "
"is available.", max_length=96, verbose_name='Dynamic label'
),
),
migrations.AlterField(
model_name='smartlinkcondition',
name='expression',
field=models.TextField(help_text="Enter a template to render. Use Django's default templating language (https://docs.djangoproject.com/en/1.11/ref/templates/builtins/). The {{ document }} context variable is available.", verbose_name='Expression'),
field=models.TextField(
help_text="Enter a template to render. Use Django's default "
"templating language (https://docs.djangoproject.com/en/"
"1.11/ref/templates/builtins/). The {{ document }} context "
"variable is available.", verbose_name='Expression'
),
),
]

4
mayan/apps/linking/tests/test_api.py
View File

@@ -19,11 +19,11 @@ from ..permissions import (
)
from .literals import (
TEST_SMART_LINK_CONDITION_FOREIGN_DOCUMENT_DATA,
TEST_SMART_LINK_CONDITION_EXPRESSION,
TEST_SMART_LINK_CONDITION_EXPRESSION_EDITED,
TEST_SMART_LINK_CONDITION_FOREIGN_DOCUMENT_DATA,
TEST_SMART_LINK_CONDITION_OPERATOR, TEST_SMART_LINK_DYNAMIC_LABEL,
TEST_SMART_LINK_LABEL_EDITED, TEST_SMART_LINK_LABEL
TEST_SMART_LINK_LABEL, TEST_SMART_LINK_LABEL_EDITED
)

2
mayan/apps/linking/tests/test_models.py
View File

@@ -6,7 +6,7 @@ from mayan.apps.documents.tests import GenericDocumentTestCase
from ..models import SmartLink
from .literals import TEST_SMART_LINK_LABEL, TEST_SMART_LINK_DYNAMIC_LABEL
from .literals import TEST_SMART_LINK_DYNAMIC_LABEL, TEST_SMART_LINK_LABEL
@override_settings(OCR_AUTO_OCR=False)

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

@@ -10,8 +10,8 @@ from ..permissions import (
)
from .literals import (
TEST_SMART_LINK_DYNAMIC_LABEL, TEST_SMART_LINK_LABEL_EDITED,
TEST_SMART_LINK_LABEL
TEST_SMART_LINK_DYNAMIC_LABEL, TEST_SMART_LINK_LABEL,
TEST_SMART_LINK_LABEL_EDITED
)

12
mayan/apps/linking/urls.py
View File

@@ -3,15 +3,15 @@ from __future__ import unicode_literals
from django.conf.urls import url
from .api_views import (
APIResolvedSmartLinkView, APIResolvedSmartLinkDocumentListView,
APIResolvedSmartLinkListView, APISmartLinkListView, APISmartLinkView,
APISmartLinkConditionListView, APISmartLinkConditionView
APIResolvedSmartLinkDocumentListView, APIResolvedSmartLinkListView,
APIResolvedSmartLinkView, APISmartLinkConditionListView,
APISmartLinkConditionView, APISmartLinkListView, APISmartLinkView
)
from .views import (
DocumentSmartLinkListView, ResolvedSmartLinkView,
SetupSmartLinkDocumentTypesView, SmartLinkConditionListView,
SmartLinkConditionCreateView, SmartLinkConditionEditView,
SmartLinkConditionDeleteView, SmartLinkCreateView, SmartLinkDeleteView,
SetupSmartLinkDocumentTypesView, SmartLinkConditionCreateView,
SmartLinkConditionDeleteView, SmartLinkConditionEditView,
SmartLinkConditionListView, SmartLinkCreateView, SmartLinkDeleteView,
SmartLinkEditView, SmartLinkListView
)

4
mayan/apps/linking/views.py
View File

@@ -19,8 +19,8 @@ from mayan.apps.documents.permissions import permission_document_view
from mayan.apps.documents.views import DocumentListView
from .forms import SmartLinkConditionForm, SmartLinkForm
from .icons import icon_smart_link_setup, icon_smart_link_condition
from .links import link_smart_link_create, link_smart_link_condition_create
from .icons import icon_smart_link_condition, icon_smart_link_setup
from .links import link_smart_link_condition_create, link_smart_link_create
from .models import ResolvedSmartLink, SmartLink, SmartLinkCondition
from .permissions import (
permission_smart_link_create, permission_smart_link_delete,