')
output.append(document_html_widget(document, click_view='document_display', view='document_preview_multipage', fancybox_class='fancybox-noscaling', gallery_name=u'smart_link_%d_documents_gallery' % value['smart_link_instance'].pk))
- #output.append(document_html_widget(document, click_view='document_display', view='document_preview_multipage', fancybox_class='fancybox-noscaling', gallery_name=u'smart_link_%d_documents_gallery' % value['smart_link_instance'].pk, image_class='lazy-load-carousel', title=document.filename))
output.append(u'
')
output.append(u'')
output.append(u'
%s' % (reverse('document_view_simple', args=[document.pk]), ugettext(u'Select')))
diff --git a/mayan/apps/lock_manager/backend_memcached.py b/mayan/apps/lock_manager/backend_memcached.py
deleted file mode 100644
index 8458fbb395..0000000000
--- a/mayan/apps/lock_manager/backend_memcached.py
+++ /dev/null
@@ -1,16 +0,0 @@
-from django.core.cache import get_cache
-
-if CACHE_URI:
- try:
- cache_backend = get_cache(CACHE_URI)
- except ImportError:
- # TODO: display or log error
- cache_backend = None
-else:
- cache_backend = None
-if cache_backend:
- acquire_lock = lambda lock_id: cache_backend.add(lock_id, u'true', LOCK_EXPIRE)
- release_lock = lambda lock_id: cache_backend.delete(lock_id)
-else:
- acquire_lock = lambda lock_id: True
- release_lock = lambda lock_id: True
diff --git a/mayan/apps/main/views.py b/mayan/apps/main/views.py
index faee398178..01ed754431 100644
--- a/mayan/apps/main/views.py
+++ b/mayan/apps/main/views.py
@@ -18,7 +18,7 @@ def home(request):
return HttpResponseRedirect(reverse('document_list_recent'))
else:
return render_to_response('home.html', {},
- context_instance=RequestContext(request))
+ context_instance=RequestContext(request))
def maintenance_menu(request):
@@ -26,7 +26,7 @@ def maintenance_menu(request):
for namespace, values in tools.items():
user_tools[namespace] = {
'title': values['title']
- }
+ }
user_tools[namespace].setdefault('links', [])
for link in values['links']:
try:
@@ -39,13 +39,11 @@ def maintenance_menu(request):
return render_to_response('tools.html', {
'blocks': user_tools,
'title': _(u'maintenance menu')
- },
- context_instance=RequestContext(request))
+ }, context_instance=RequestContext(request))
def diagnostics_view(request):
return render_to_response('diagnostics.html', {
'blocks': diagnostics,
'title': _(u'Diagnostics')
- },
- context_instance=RequestContext(request))
+ }, context_instance=RequestContext(request))
diff --git a/mayan/apps/ocr/api.py b/mayan/apps/ocr/api.py
index d1220ec6fa..195e65994e 100644
--- a/mayan/apps/ocr/api.py
+++ b/mayan/apps/ocr/api.py
@@ -2,7 +2,6 @@ from __future__ import absolute_import
import logging
import os
-import subprocess
import tempfile
import sh
diff --git a/mayan/apps/ocr/tests.py b/mayan/apps/ocr/tests.py
index abd5ed10ef..94a0a20e05 100644
--- a/mayan/apps/ocr/tests.py
+++ b/mayan/apps/ocr/tests.py
@@ -1,7 +1,6 @@
from __future__ import absolute_import
import os
-import time
from django.conf import settings
from django.core.files.base import File
@@ -9,10 +8,8 @@ from django.utils import unittest
from documents.models import Document, DocumentType
-from .literals import (QUEUEDOCUMENT_STATE_PROCESSING,
- DOCUMENTQUEUE_STATE_STOPPED, DOCUMENTQUEUE_STATE_ACTIVE)
-from .models import DocumentQueue
from .api import do_document_ocr
+from .models import DocumentQueue
class DocumentSearchTestCase(unittest.TestCase):
diff --git a/mayan/apps/permissions/__init__.py b/mayan/apps/permissions/__init__.py
index adf0308b44..a291369159 100644
--- a/mayan/apps/permissions/__init__.py
+++ b/mayan/apps/permissions/__init__.py
@@ -33,6 +33,7 @@ def user_post_save(sender, instance, **kwargs):
except ObjectDoesNotExist:
pass
+
post_save.connect(user_post_save, sender=User)
register_setup(role_list)
diff --git a/mayan/apps/permissions/api.py b/mayan/apps/permissions/api.py
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/mayan/apps/permissions/middleware/permission_denied_middleware.py b/mayan/apps/permissions/middleware/permission_denied_middleware.py
index 221084a81b..ea7e04b932 100644
--- a/mayan/apps/permissions/middleware/permission_denied_middleware.py
+++ b/mayan/apps/permissions/middleware/permission_denied_middleware.py
@@ -5,7 +5,7 @@ from django.template import RequestContext, Template, loader, TemplateDoesNotExi
from django.utils.importlib import import_module
-#http://mitchfournier.com/2010/07/12/show-a-custom-403-forbidden-error-page-in-django/
+# http://mitchfournier.com/2010/07/12/show-a-custom-403-forbidden-error-page-in-django/
class PermissionDeniedMiddleware(object):
def process_exception(self, request, exception):
if isinstance(exception, PermissionDenied):
diff --git a/mayan/apps/permissions/migrations/0001_initial.py b/mayan/apps/permissions/migrations/0001_initial.py
index e69a10a4db..35738e0009 100644
--- a/mayan/apps/permissions/migrations/0001_initial.py
+++ b/mayan/apps/permissions/migrations/0001_initial.py
@@ -1,13 +1,12 @@
# encoding: utf-8
-import datetime
from south.db import db
from south.v2 import SchemaMigration
from django.db import models
+
class Migration(SchemaMigration):
def forwards(self, orm):
-
# Adding model 'Permission'
db.create_table('permissions_permission', (
('id', self.gf('django.db.models.fields.AutoField')(primary_key=True)),
@@ -46,9 +45,7 @@ class Migration(SchemaMigration):
))
db.send_create_signal('permissions', ['RoleMember'])
-
def backwards(self, orm):
-
# Removing unique constraint on 'Permission', fields ['namespace', 'name']
db.delete_unique('permissions_permission', ['namespace', 'name'])
@@ -64,7 +61,6 @@ class Migration(SchemaMigration):
# Deleting model 'RoleMember'
db.delete_table('permissions_rolemember')
-
models = {
'contenttypes.contenttype': {
'Meta': {'ordering': "('name',)", 'unique_together': "(('app_label', 'model'),)", 'object_name': 'ContentType', 'db_table': "'django_content_type'"},
diff --git a/mayan/apps/permissions/migrations/0002_auto__add_storedpermission__add_unique_storedpermission_namespace_name.py b/mayan/apps/permissions/migrations/0002_auto__add_storedpermission__add_unique_storedpermission_namespace_name.py
index 0109b2548e..27c3fbbf36 100644
--- a/mayan/apps/permissions/migrations/0002_auto__add_storedpermission__add_unique_storedpermission_namespace_name.py
+++ b/mayan/apps/permissions/migrations/0002_auto__add_storedpermission__add_unique_storedpermission_namespace_name.py
@@ -1,13 +1,12 @@
# encoding: utf-8
-import datetime
from south.db import db
from south.v2 import SchemaMigration
from django.db import models
+
class Migration(SchemaMigration):
def forwards(self, orm):
-
# Adding model 'StoredPermission'
db.create_table('permissions_storedpermission', (
('id', self.gf('django.db.models.fields.AutoField')(primary_key=True)),
@@ -22,9 +21,7 @@ class Migration(SchemaMigration):
# Changing field 'PermissionHolder.permission'
db.alter_column('permissions_permissionholder', 'permission_id', self.gf('django.db.models.fields.related.ForeignKey')(to=orm['permissions.StoredPermission']))
-
def backwards(self, orm):
-
# Removing unique constraint on 'StoredPermission', fields ['namespace', 'name']
db.delete_unique('permissions_storedpermission', ['namespace', 'name'])
@@ -34,7 +31,6 @@ class Migration(SchemaMigration):
# Changing field 'PermissionHolder.permission'
db.alter_column('permissions_permissionholder', 'permission_id', self.gf('django.db.models.fields.related.ForeignKey')(to=orm['permissions.Permission']))
-
models = {
'contenttypes.contenttype': {
'Meta': {'ordering': "('name',)", 'unique_together': "(('app_label', 'model'),)", 'object_name': 'ContentType', 'db_table': "'django_content_type'"},
diff --git a/mayan/apps/permissions/migrations/0003_clear_permission_holders.py b/mayan/apps/permissions/migrations/0003_clear_permission_holders.py
index b745b97a3a..acca01ce5d 100644
--- a/mayan/apps/permissions/migrations/0003_clear_permission_holders.py
+++ b/mayan/apps/permissions/migrations/0003_clear_permission_holders.py
@@ -1,20 +1,18 @@
# encoding: utf-8
-import datetime
from south.db import db
from south.v2 import DataMigration
from django.db import models
+
class Migration(DataMigration):
def forwards(self, orm):
for permission_holder in orm.PermissionHolder.objects.all():
permission_holder.delete()
-
def backwards(self, orm):
raise RuntimeError("Cannot reverse this migration.")
-
models = {
'contenttypes.contenttype': {
'Meta': {'ordering': "('name',)", 'unique_together': "(('app_label', 'model'),)", 'object_name': 'ContentType', 'db_table': "'django_content_type'"},
diff --git a/mayan/apps/permissions/migrations/0004_auto__del_permission__del_unique_permission_namespace_name.py b/mayan/apps/permissions/migrations/0004_auto__del_permission__del_unique_permission_namespace_name.py
index adb93d9490..46199f109f 100644
--- a/mayan/apps/permissions/migrations/0004_auto__del_permission__del_unique_permission_namespace_name.py
+++ b/mayan/apps/permissions/migrations/0004_auto__del_permission__del_unique_permission_namespace_name.py
@@ -1,22 +1,19 @@
# encoding: utf-8
-import datetime
from south.db import db
from south.v2 import SchemaMigration
from django.db import models
+
class Migration(SchemaMigration):
def forwards(self, orm):
-
# Removing unique constraint on 'Permission', fields ['namespace', 'name']
db.delete_unique('permissions_permission', ['namespace', 'name'])
# Deleting model 'Permission'
db.delete_table('permissions_permission')
-
def backwards(self, orm):
-
# Adding model 'Permission'
db.create_table('permissions_permission', (
('namespace', self.gf('django.db.models.fields.CharField')(max_length=64)),
@@ -29,7 +26,6 @@ class Migration(SchemaMigration):
# Adding unique constraint on 'Permission', fields ['namespace', 'name']
db.create_unique('permissions_permission', ['namespace', 'name'])
-
models = {
'contenttypes.contenttype': {
'Meta': {'ordering': "('name',)", 'unique_together': "(('app_label', 'model'),)", 'object_name': 'ContentType', 'db_table': "'django_content_type'"},
diff --git a/mayan/apps/permissions/views.py b/mayan/apps/permissions/views.py
index 72bcf87e1f..df54f9e2c7 100644
--- a/mayan/apps/permissions/views.py
+++ b/mayan/apps/permissions/views.py
@@ -6,7 +6,7 @@ import operator
from django.contrib import messages
from django.contrib.auth.models import User, Group
from django.contrib.contenttypes.models import ContentType
-from django.core.urlresolvers import reverse, reverse_lazy
+from django.core.urlresolvers import reverse_lazy
from django.http import HttpResponseRedirect, Http404
from django.shortcuts import render_to_response, get_object_or_404
from django.template import RequestContext
diff --git a/mayan/apps/registration/migrations/0001_initial.py b/mayan/apps/registration/migrations/0001_initial.py
index c837912d94..771dc033ae 100644
--- a/mayan/apps/registration/migrations/0001_initial.py
+++ b/mayan/apps/registration/migrations/0001_initial.py
@@ -1,5 +1,4 @@
# -*- coding: utf-8 -*-
-import datetime
from south.db import db
from south.v2 import SchemaMigration
from django.db import models
@@ -17,12 +16,10 @@ class Migration(SchemaMigration):
))
db.send_create_signal('registration', ['RegistrationSingleton'])
-
def backwards(self, orm):
# Deleting model 'RegistrationSingleton'
db.delete_table('registration_registrationsingleton')
-
models = {
'registration.registrationsingleton': {
'Meta': {'object_name': 'RegistrationSingleton'},
@@ -33,4 +30,4 @@ class Migration(SchemaMigration):
}
}
- complete_apps = ['registration']
\ No newline at end of file
+ complete_apps = ['registration']
diff --git a/mayan/apps/registration/migrations/0002_auto__del_field_registrationsingleton_lock_id.py b/mayan/apps/registration/migrations/0002_auto__del_field_registrationsingleton_lock_id.py
index d1c795b26e..926e770324 100644
--- a/mayan/apps/registration/migrations/0002_auto__del_field_registrationsingleton_lock_id.py
+++ b/mayan/apps/registration/migrations/0002_auto__del_field_registrationsingleton_lock_id.py
@@ -1,5 +1,4 @@
# -*- coding: utf-8 -*-
-from south.utils import datetime_utils as datetime
from south.db import db
from south.v2 import SchemaMigration
from django.db import models
@@ -11,14 +10,12 @@ class Migration(SchemaMigration):
# Deleting field 'RegistrationSingleton.lock_id'
db.delete_column(u'registration_registrationsingleton', 'lock_id')
-
def backwards(self, orm):
# Adding field 'RegistrationSingleton.lock_id'
db.add_column(u'registration_registrationsingleton', 'lock_id',
self.gf('django.db.models.fields.CharField')(default=1, max_length=1, unique=True),
keep_default=False)
-
models = {
u'registration.registrationsingleton': {
'Meta': {'object_name': 'RegistrationSingleton'},
@@ -28,4 +25,4 @@ class Migration(SchemaMigration):
}
}
- complete_apps = ['registration']
\ No newline at end of file
+ complete_apps = ['registration']
diff --git a/mayan/apps/rest_api/filters.py b/mayan/apps/rest_api/filters.py
index 144717c3ca..c9eda7256d 100644
--- a/mayan/apps/rest_api/filters.py
+++ b/mayan/apps/rest_api/filters.py
@@ -19,4 +19,3 @@ class MayanObjectPermissionsFilter(BaseFilterBackend):
return queryset
else:
return queryset
-
diff --git a/mayan/apps/rest_api/serializers.py b/mayan/apps/rest_api/serializers.py
index 8e0494f2b0..d1fb34d0d7 100644
--- a/mayan/apps/rest_api/serializers.py
+++ b/mayan/apps/rest_api/serializers.py
@@ -1,9 +1,6 @@
from __future__ import absolute_import
-from django.contrib.auth.models import Group, User
-
from rest_framework import serializers
-from rest_framework.reverse import reverse
class APISerializer(serializers.Serializer):
@@ -18,4 +15,3 @@ class APIAppSerializer(serializers.Serializer):
class APIVersionSerializer(serializers.Serializer):
apps = APIAppSerializer()
-
diff --git a/mayan/apps/rest_api/views.py b/mayan/apps/rest_api/views.py
index 7e16349c36..759b3be228 100644
--- a/mayan/apps/rest_api/views.py
+++ b/mayan/apps/rest_api/views.py
@@ -3,10 +3,7 @@ from __future__ import absolute_import
import logging
-from django.utils.translation import ugettext_lazy as _
-
from rest_framework import generics
-from rest_framework.generics import RetrieveAPIView
from rest_framework.response import Response
from rest_framework.reverse import reverse
diff --git a/mayan/apps/smart_settings/__init__.py b/mayan/apps/smart_settings/__init__.py
index 6643d18458..d483e386ff 100644
--- a/mayan/apps/smart_settings/__init__.py
+++ b/mayan/apps/smart_settings/__init__.py
@@ -1,16 +1,7 @@
from __future__ import absolute_import
-from django.utils.translation import ugettext_lazy as _
-
from project_setup.api import register_setup
from .links import check_settings
-
-def is_superuser(context):
- return context['request'].user.is_staff or context['request'].user.is_superuser
-
-
-check_settings = {'text': _(u'settings'), 'view': 'setting_list', 'famfam': 'cog', 'icon': 'cog.png', 'condition': is_superuser, 'children_view_regex': [r'^setting_']}
-
register_setup(check_settings)
diff --git a/mayan/apps/smart_settings/views.py b/mayan/apps/smart_settings/views.py
index a08872d053..686c259d90 100644
--- a/mayan/apps/smart_settings/views.py
+++ b/mayan/apps/smart_settings/views.py
@@ -23,7 +23,7 @@ def setting_list(request):
'description': sub_setting.get('description', None),
'exists': sub_setting.get('exists', False),
'default': sub_setting['default'],
- })
+ })
context = {
'title': _(u'settings'),
'object_list': new_settings,
@@ -32,7 +32,8 @@ def setting_list(request):
'extra_columns': [
{'name': _(u'name'), 'attribute': encapsulate(lambda x: mark_safe(u'
%s%s' % (x.get('global_name'), x.get('description'))))},
{'name': _(u'default'), 'attribute': encapsulate(lambda x: return_type(x['default']))},
- {'name': _(u'value'), 'attribute': encapsulate(lambda x: mark_safe(u'
%s %s
' % (
+ {
+ 'name': _(u'value'), 'attribute': encapsulate(lambda x: mark_safe(u'
%s %s
' % (
return_type(getattr(x['module'], x['name'])),
exists_with_famfam(getattr(x['module'], x['name'])) if x['exists'] else ''
)))
diff --git a/mayan/apps/sources/__init__.py b/mayan/apps/sources/__init__.py
index 649a1ede6f..f5b85f05e3 100644
--- a/mayan/apps/sources/__init__.py
+++ b/mayan/apps/sources/__init__.py
@@ -46,10 +46,11 @@ register_links(['setup_source_transformation_create', 'setup_source_transformati
source_views = ['setup_web_form_list', 'setup_staging_folder_list', 'setup_watch_folder_list', 'setup_source_edit', 'setup_source_delete', 'setup_source_create', 'setup_source_transformation_list', 'setup_source_transformation_edit', 'setup_source_transformation_delete', 'setup_source_transformation_create']
register_model_list_columns(StagingFile, [
- {'name': _(u'thumbnail'), 'attribute':
- encapsulate(lambda x: staging_file_thumbnail(x, gallery_name='staging_list', title=x.filename, size='100'))
- },
- ])
+ {
+ 'name': _(u'thumbnail'), 'attribute':
+ encapsulate(lambda x: staging_file_thumbnail(x, gallery_name='staging_list', title=x.filename, size='100'))
+ },
+])
register_setup(setup_sources)
diff --git a/mayan/apps/sources/api_views.py b/mayan/apps/sources/api_views.py
index a1cc60adc5..cd2f3a2702 100644
--- a/mayan/apps/sources/api_views.py
+++ b/mayan/apps/sources/api_views.py
@@ -1,20 +1,15 @@
from __future__ import absolute_import
-from django.core.exceptions import PermissionDenied
from django.shortcuts import get_object_or_404
from converter.exceptions import UnkownConvertError, UnknownFileFormat
-from converter.literals import (DEFAULT_FILE_FORMAT_MIMETYPE, DEFAULT_PAGE_NUMBER,
+from converter.literals import (DEFAULT_PAGE_NUMBER,
DEFAULT_ROTATION, DEFAULT_ZOOM_LEVEL)
-from permissions.models import Permission
from rest_framework import generics
from rest_framework.response import Response
-from documents.conf.settings import (DISPLAY_SIZE, PREVIEW_SIZE, RECENT_COUNT,
- ROTATION_STEP, ZOOM_PERCENT_STEP, ZOOM_MAX_LEVEL,
- ZOOM_MIN_LEVEL)
-from rest_api.filters import MayanObjectPermissionsFilter
-from rest_api.permissions import MayanPermission
+from documents.conf.settings import (DISPLAY_SIZE, ZOOM_MAX_LEVEL,
+ ZOOM_MIN_LEVEL)
from .models import StagingFolder
from .serializers import (StagingFolderFileSerializer, StagingFolderSerializer,
@@ -81,9 +76,10 @@ class APIStagingSourceFileImageView(generics.GenericAPIView):
rotation = int(request.GET.get('rotation', DEFAULT_ROTATION)) % 360
try:
- return Response({'status': 'success',
+ return Response({
+ 'status': 'success',
'data': staging_file.get_image(size=size, page=page, zoom=zoom, rotation=rotation, as_base64=True)
- })
+ })
except UnknownFileFormat as exception:
return Response({'status': 'error', 'detail': 'unknown_file_format', 'message': unicode(exception)})
except UnkownConvertError as exception:
diff --git a/mayan/apps/sources/migrations/0001_initial.py b/mayan/apps/sources/migrations/0001_initial.py
index 83a75f18af..68301ec64d 100644
--- a/mayan/apps/sources/migrations/0001_initial.py
+++ b/mayan/apps/sources/migrations/0001_initial.py
@@ -1,5 +1,4 @@
# encoding: utf-8
-import datetime
from south.db import db
from south.v2 import SchemaMigration
from django.db import models
@@ -72,7 +71,6 @@ class Migration(SchemaMigration):
db.send_create_signal('sources', ['OutOfProcess'])
def backwards(self, orm):
-
# Deleting model 'StagingFolder'
db.delete_table('sources_stagingfolder')
diff --git a/mayan/apps/sources/registry.py b/mayan/apps/sources/registry.py
index 8056fb1dda..53de56453d 100644
--- a/mayan/apps/sources/registry.py
+++ b/mayan/apps/sources/registry.py
@@ -1,7 +1,5 @@
from __future__ import absolute_import
-from django.conf.urls import url
-
from .cleanup import cleanup
cleanup_functions = [cleanup]
diff --git a/mayan/apps/sources/views.py b/mayan/apps/sources/views.py
index d09ce7ad44..e2f6a4c692 100644
--- a/mayan/apps/sources/views.py
+++ b/mayan/apps/sources/views.py
@@ -12,15 +12,8 @@ from django.utils.safestring import mark_safe
from django.utils.translation import ugettext
from django.utils.translation import ugettext_lazy as _
-from rest_framework import generics
-from rest_framework.response import Response
-
from acls.models import AccessEntry
from common.utils import encapsulate
-from converter.exceptions import UnkownConvertError, UnknownFileFormat
-from converter.literals import (DEFAULT_PAGE_NUMBER, DEFAULT_ROTATION,
- DEFAULT_ZOOM_LEVEL)
-from documents.conf.settings import DISPLAY_SIZE, ZOOM_MAX_LEVEL, ZOOM_MIN_LEVEL
from documents.exceptions import NewDocumentVersionNotAllowed
from documents.models import DocumentType, Document
from documents.permissions import (PERMISSION_DOCUMENT_CREATE,
@@ -38,8 +31,6 @@ from .models import (WebForm, StagingFolder, SourceTransformation,
from .permissions import (PERMISSION_SOURCES_SETUP_VIEW,
PERMISSION_SOURCES_SETUP_EDIT, PERMISSION_SOURCES_SETUP_DELETE,
PERMISSION_SOURCES_SETUP_CREATE)
-from .serializers import (StagingFolderSerializer, StagingFolderFileSerializer,
- StagingSourceFileImageSerializer)
def document_create_siblings(request, document_id):
diff --git a/mayan/apps/statistics/__init__.py b/mayan/apps/statistics/__init__.py
index 21c358c962..622534a022 100644
--- a/mayan/apps/statistics/__init__.py
+++ b/mayan/apps/statistics/__init__.py
@@ -1,6 +1,6 @@
from __future__ import absolute_import
-from navigation.api import register_links, register_model_list_columns
+from navigation.api import register_links
from .classes import Statistic, StatisticNamespace
from .links import link_execute, link_namespace_details, link_namespace_list
diff --git a/mayan/apps/tags/__init__.py b/mayan/apps/tags/__init__.py
index d5da8c6d16..34e6bb4717 100644
--- a/mayan/apps/tags/__init__.py
+++ b/mayan/apps/tags/__init__.py
@@ -33,7 +33,8 @@ register_model_list_columns(Tag, [
])
register_model_list_columns(Document, [
- {'name': _(u'tags'), 'attribute':
+ {
+ 'name': _(u'tags'), 'attribute':
encapsulate(lambda x: get_tags_inline_widget_simple(x))
},
])
diff --git a/mayan/apps/tags/api_views.py b/mayan/apps/tags/api_views.py
index ab587fae70..552bb18c9a 100644
--- a/mayan/apps/tags/api_views.py
+++ b/mayan/apps/tags/api_views.py
@@ -1,10 +1,6 @@
from __future__ import absolute_import
-from django.core.exceptions import PermissionDenied
-
-from permissions.models import Permission
from rest_framework import generics
-from rest_framework.response import Response
from rest_api.filters import MayanObjectPermissionsFilter
from rest_api.permissions import MayanPermission
diff --git a/mayan/apps/tags/views.py b/mayan/apps/tags/views.py
index 41f90243b4..a617d77b99 100644
--- a/mayan/apps/tags/views.py
+++ b/mayan/apps/tags/views.py
@@ -10,7 +10,6 @@ from django.shortcuts import render_to_response, get_object_or_404
from django.template import RequestContext
from django.utils.translation import ugettext_lazy as _
-from rest_framework import generics
from taggit.models import Tag
from acls.models import AccessEntry
@@ -20,15 +19,12 @@ from documents.models import Document
from documents.views import document_list
from documents.permissions import PERMISSION_DOCUMENT_VIEW
from permissions.models import Permission
-from rest_api.filters import MayanObjectPermissionsFilter
-from rest_api.permissions import MayanPermission
from .forms import TagListForm, TagForm
from .models import TagProperties
from .permissions import (PERMISSION_TAG_CREATE, PERMISSION_TAG_ATTACH,
PERMISSION_TAG_REMOVE, PERMISSION_TAG_DELETE, PERMISSION_TAG_EDIT,
PERMISSION_TAG_VIEW)
-from .serializers import TagSerializer
logger = logging.getLogger(__name__)
@@ -60,8 +56,7 @@ def tag_create(request):
return render_to_response('generic_form.html', {
'title': _(u'create tag'),
'form': form,
- },
- context_instance=RequestContext(request))
+ }, context_instance=RequestContext(request))
def tag_attach(request, document_id=None, document_id_list=None):
@@ -143,10 +138,8 @@ def tag_list(request, queryset=None, extra_context=None):
context['object_list'] = queryset
- return render_to_response('generic_list.html',
- context,
- context_instance=RequestContext(request)
- )
+ return render_to_response('generic_list.html', context,
+ context_instance=RequestContext(request))
def tag_delete(request, tag_id=None, tag_id_list=None):
@@ -235,8 +228,7 @@ def tag_edit(request, tag_id):
'form': form,
'object': tag,
'object_name': _(u'tag'),
- },
- context_instance=RequestContext(request))
+ }, context_instance=RequestContext(request))
def tag_tagged_item_list(request, tag_id):
diff --git a/mayan/apps/user_management/registry.py b/mayan/apps/user_management/registry.py
index 520ea4d909..53de56453d 100644
--- a/mayan/apps/user_management/registry.py
+++ b/mayan/apps/user_management/registry.py
@@ -2,5 +2,4 @@ from __future__ import absolute_import
from .cleanup import cleanup
-
cleanup_functions = [cleanup]
diff --git a/mayan/apps/user_management/views.py b/mayan/apps/user_management/views.py
index 0f72b83373..011701aff2 100644
--- a/mayan/apps/user_management/views.py
+++ b/mayan/apps/user_management/views.py
@@ -8,6 +8,7 @@ from django.http import HttpResponseRedirect
from django.shortcuts import render_to_response, get_object_or_404
from django.template import RequestContext
from django.utils.translation import ugettext_lazy as _
+
from common.utils import generate_choices_w_labels, encapsulate
from common.views import assign_remove
from common.widgets import two_state_template
@@ -73,8 +74,7 @@ def user_edit(request, user_id):
'form': form,
'object': user,
'object_name': _(u'user'),
- },
- context_instance=RequestContext(request))
+ }, context_instance=RequestContext(request))
def user_add(request):
@@ -94,8 +94,7 @@ def user_add(request):
return render_to_response('generic_form.html', {
'title': _(u'create new user'),
'form': form,
- },
- context_instance=RequestContext(request))
+ }, context_instance=RequestContext(request))
def user_delete(request, user_id=None, user_id_list=None):
@@ -215,7 +214,6 @@ def user_multiple_set_password(request):
def get_user_groups(user):
- #return user.group_set.all()
return Group.objects.filter(user=user)
@@ -303,8 +301,7 @@ def group_add(request):
return render_to_response('generic_form.html', {
'title': _(u'create new group'),
'form': form,
- },
- context_instance=RequestContext(request))
+ }, context_instance=RequestContext(request))
def group_delete(request, group_id=None, group_id_list=None):
diff --git a/mayan/apps/web_theme/templatetags/theme_tags.py b/mayan/apps/web_theme/templatetags/theme_tags.py
index 05878bf798..006a1cda1f 100644
--- a/mayan/apps/web_theme/templatetags/theme_tags.py
+++ b/mayan/apps/web_theme/templatetags/theme_tags.py
@@ -1,10 +1,12 @@
+from __future__ import absolute_import
+
import re
from django.conf import settings
from django.template import Library, Node, TemplateSyntaxError
from django.utils.safestring import mark_safe
-from web_theme.conf import settings as web_theme_settings
+from ..conf import settings as web_theme_settings
register = Library()
@@ -27,15 +29,11 @@ def get_theme(parser, token):
except ValueError:
raise TemplateSyntaxError('%r tag requires arguments' % token.contents.split()[0])
- #m = re.search(r'(.*?) as (\w+)', arg)
m = re.search(r'as (\w+)', arg)
if not m:
raise TemplateSyntaxError('%r tag had invalid arguments' % tag_name)
- #format_string, var_name = m.groups()
var_name = m.groups()
- #if not (format_string[0] == format_string[-1] and format_string[0] in ('"', "'")):
- # raise template.TemplateSyntaxError, "%r tag's argument should be in quotes" % tag_name
return GetThemeNode(var_name)
@@ -79,5 +77,4 @@ def get_web_theme_setting(parser, token):
@register.filter
def highlight(text, word):
- #return mark_safe(unicode(text).replace(word, mark_safe('
%s' % word)))
return mark_safe(unicode(text).replace(word, mark_safe('
%s' % word)))
diff --git a/mayan/bin/mayan-edms.py b/mayan/bin/mayan-edms.py
index 47a0084392..c8d9c5d18b 100755
--- a/mayan/bin/mayan-edms.py
+++ b/mayan/bin/mayan-edms.py
@@ -8,4 +8,3 @@ if __name__ == "__main__":
from django.core.management import execute_from_command_line
execute_from_command_line(sys.argv)
-
diff --git a/mayan/config/example.py b/mayan/config/example.py
index b73b9d8f99..0b4445d0ba 100644
--- a/mayan/config/example.py
+++ b/mayan/config/example.py
@@ -10,7 +10,7 @@ from mayan.settings import *
# 'NAME': '
',
#
# }
-#}
+# }
# Production file locations (document_storage, gpg_home, image_cache)
# SITE_ROOT = '/local/mayan_files/
diff --git a/mayan/settings.py b/mayan/settings.py
index 027be00cc4..26723ec10a 100644
--- a/mayan/settings.py
+++ b/mayan/settings.py
@@ -34,7 +34,7 @@ ALLOWED_HOSTS = []
# Application definition
INSTALLED_APPS = (
-#Django
+# Django
'django.contrib.auth',
'django.contrib.contenttypes',
'django.contrib.sessions',
@@ -223,7 +223,7 @@ STATICFILES_FINDERS = (
# --------- Django compressor -------------
COMPRESS_PARSER = 'compressor.parser.HtmlParser'
COMPRESS_CSS_FILTERS = ['compressor.filters.css_default.CssAbsoluteFilter', 'compressor.filters.cssmin.CSSMinFilter']
-COMPRESS_ENABLED=False
+COMPRESS_ENABLED = False
# ---------- Django sendfile --------------
SENDFILE_BACKEND = 'sendfile.backends.simple'
# --------- Web theme ---------------
@@ -299,7 +299,7 @@ if DEBUG:
try:
import debug_toolbar
- #INSTALLED_APPS +=('debug_toolbar',)
+ # INSTALLED_APPS +=('debug_toolbar',)
except ImportError:
pass