PEP8 cleanup, remove unused imports, fix permission check when removing metadata from a document

This commit is contained in:
Roberto Rosario
2015-01-26 19:17:35 -04:00
parent c15740e152
commit f4d3767b15
76 changed files with 76 additions and 223 deletions

View File

@@ -19,7 +19,6 @@ class ExtraContextMixin(object):
return context
class ObjectListPermissionFilterMixin(object):
object_permission = None
@@ -54,7 +53,6 @@ class ObjectPermissionCheckMixin(object):
return super(ObjectPermissionCheckMixin, self).dispatch(request, *args, **kwargs)
class RedirectionMixin(object):
post_action_redirect = None
@@ -75,6 +73,7 @@ class RedirectionMixin(object):
return context
class ViewPermissionCheckMixin(object):
view_permission = None
@@ -83,4 +82,3 @@ class ViewPermissionCheckMixin(object):
Permission.objects.check_permissions(self.request.user, [self.view_permission])
return super(ViewPermissionCheckMixin, self).dispatch(request, *args, **kwargs)

View File

@@ -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
@@ -15,12 +14,10 @@ class Migration(SchemaMigration):
))
db.send_create_signal(u'common', ['SharedUploadedFile'])
def backwards(self, orm):
# Deleting model 'SharedUploadedFile'
db.delete_table(u'common_shareduploadedfile')
models = {
u'auth.group': {
'Meta': {'object_name': 'Group'},

View File

@@ -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
@@ -13,12 +12,10 @@ class Migration(SchemaMigration):
self.gf('django.db.models.fields.CharField')(default='', max_length=255),
keep_default=False)
def backwards(self, orm):
# Deleting field 'SharedUploadedFile.filename'
db.delete_column(u'common_shareduploadedfile', 'filename')
models = {
u'auth.group': {
'Meta': {'object_name': 'Group'},

View File

@@ -13,12 +13,10 @@ class Migration(SchemaMigration):
self.gf('django.db.models.fields.DateTimeField')(auto_now_add=True, default=datetime.datetime(2014, 10, 29, 0, 0), blank=True),
keep_default=False)
def backwards(self, orm):
# Deleting field 'SharedUploadedFile.datatime'
db.delete_column(u'common_shareduploadedfile', 'datatime')
models = {
u'auth.group': {
'Meta': {'object_name': 'Group'},

View File

@@ -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
@@ -17,12 +16,10 @@ class Migration(SchemaMigration):
))
db.send_create_signal(u'common', ['UserLocaleProfile'])
def backwards(self, orm):
# Deleting model 'UserLocaleProfile'
db.delete_table(u'common_userlocaleprofile')
models = {
u'auth.group': {
'Meta': {'object_name': 'Group'},

View File

@@ -1,5 +1,4 @@
# -*- coding: utf-8 -*-
from south.utils import datetime_utils as datetime
from south.db import db
from south.v2 import DataMigration
from django.db import models

View File

@@ -7,7 +7,6 @@ from django.contrib.auth.models import User
from django.contrib.auth.views import login, password_change
from django.contrib.contenttypes.models import ContentType
from django.conf import settings
from django.core.exceptions import PermissionDenied
from django.core.urlresolvers import reverse
from django.http import HttpResponseRedirect
from django.shortcuts import redirect, render_to_response
@@ -18,9 +17,6 @@ from django.views.generic import FormView
from django.views.generic.edit import CreateView, DeleteView, UpdateView
from django.views.generic.list import ListView
from acls.models import AccessEntry
from permissions.models import Permission
from .forms import (
ChoiceForm, EmailAuthenticationForm, LicenseForm, LocaleProfileForm,
LocaleProfileForm_view, UserForm, UserForm_view
@@ -308,7 +304,6 @@ def password_change_done(request):
return redirect('common:current_user_details')
class SingleObjectEditView(ViewPermissionCheckMixin, ObjectPermissionCheckMixin, ExtraContextMixin, RedirectionMixin, UpdateView):
template_name = 'main/generic_form.html'

View File

@@ -2,7 +2,6 @@ from __future__ import unicode_literals
import io
import logging
import tempfile
import slate
from PIL import Image

View File

@@ -2,7 +2,6 @@ from __future__ import unicode_literals
import logging
import os
import sys
import tempfile
try:

View File

@@ -2,7 +2,6 @@ from __future__ import unicode_literals
import logging
from django.db.models import Q
from django.utils.translation import ugettext_lazy as _
from .models import Index, IndexInstanceNode

View File

@@ -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,7 +10,6 @@ class Migration(SchemaMigration):
# Deleting model 'DocumentRenameCount'
db.delete_table(u'document_indexing_documentrenamecount')
def backwards(self, orm):
# Adding model 'DocumentRenameCount'
db.create_table(u'document_indexing_documentrenamecount', (
@@ -22,7 +20,6 @@ class Migration(SchemaMigration):
))
db.send_create_signal('document_indexing', ['DocumentRenameCount'])
models = {
u'document_indexing.index': {
'Meta': {'object_name': 'Index'},

View File

@@ -22,6 +22,3 @@ link_setup_workflow_document_types = {'text': _('Document types'), 'view': 'docu
link_document_workflow_instance_list = {'text': _('Workflows'), 'view': 'document_states:document_workflow_instance_list', 'args': 'object.pk', 'famfam': 'table'}
link_workflow_instance_detail = {'text': _('Detail'), 'view': 'document_states:workflow_instance_detail', 'args': 'workflow_instance.pk', 'famfam': 'table'}
link_workflow_instance_transition = {'text': _('Transition'), 'view': 'document_states:workflow_instance_transition', 'args': 'workflow_instance.pk', 'famfam': 'table_lightning'}

View File

@@ -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
@@ -64,7 +63,6 @@ class Migration(SchemaMigration):
))
db.send_create_signal(u'document_states', ['WorkflowInstanceLogEntry'])
def backwards(self, orm):
# Removing unique constraint on 'WorkflowInstance', fields ['document', 'workflow']
db.delete_unique(u'document_states_workflowinstance', ['document_id', 'workflow_id'])
@@ -90,7 +88,6 @@ class Migration(SchemaMigration):
# Deleting model 'WorkflowInstanceLogEntry'
db.delete_table(u'document_states_workflowinstancelogentry')
models = {
u'document_states.documenttypeworkflow': {
'Meta': {'unique_together': "((u'document_type', u'workflow'),)", 'object_name': 'DocumentTypeWorkflow'},

View File

@@ -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
@@ -13,12 +12,10 @@ class Migration(SchemaMigration):
self.gf('django.db.models.fields.related.ForeignKey')(default=1, to=orm['document_states.Workflow']),
keep_default=False)
def backwards(self, orm):
# Deleting field 'WorkflowTransition.workflow'
db.delete_column(u'document_states_workflowtransition', 'workflow_id')
models = {
u'document_states.documenttypeworkflow': {
'Meta': {'unique_together': "((u'document_type', u'workflow'),)", 'object_name': 'DocumentTypeWorkflow'},

View File

@@ -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,12 +10,10 @@ class Migration(SchemaMigration):
# Adding unique constraint on 'WorkflowTransition', fields ['workflow', 'origin_state', 'destination_state']
db.create_unique(u'document_states_workflowtransition', ['workflow_id', 'origin_state_id', 'destination_state_id'])
def backwards(self, orm):
# Removing unique constraint on 'WorkflowTransition', fields ['workflow', 'origin_state', 'destination_state']
db.delete_unique(u'document_states_workflowtransition', ['workflow_id', 'origin_state_id', 'destination_state_id'])
models = {
u'document_states.documenttypeworkflow': {
'Meta': {'unique_together': "((u'document_type', u'workflow'),)", 'object_name': 'DocumentTypeWorkflow'},

View File

@@ -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
@@ -24,7 +23,6 @@ class Migration(SchemaMigration):
self.gf('django.db.models.fields.related.ForeignKey')(default=1, to=orm['document_states.WorkflowTransition']),
keep_default=False)
def backwards(self, orm):
# User chose to not deal with backwards NULL issues for 'WorkflowInstanceLogEntry.document'
@@ -50,7 +48,6 @@ class Migration(SchemaMigration):
# Deleting field 'WorkflowInstanceLogEntry.transition'
db.delete_column(u'document_states_workflowinstancelogentry', 'transition_id')
models = {
u'document_states.documenttypeworkflow': {
'Meta': {'unique_together': "((u'document_type', u'workflow'),)", 'object_name': 'DocumentTypeWorkflow'},

View File

@@ -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
@@ -14,7 +13,6 @@ class Migration(SchemaMigration):
# Adding unique constraint on 'WorkflowState', fields ['workflow', 'label']
db.create_unique(u'document_states_workflowstate', ['workflow_id', 'label'])
def backwards(self, orm):
# Removing unique constraint on 'WorkflowState', fields ['workflow', 'label']
db.delete_unique(u'document_states_workflowstate', ['workflow_id', 'label'])
@@ -22,7 +20,6 @@ class Migration(SchemaMigration):
# Adding unique constraint on 'WorkflowState', fields ['label']
db.create_unique(u'document_states_workflowstate', ['label'])
models = {
u'document_states.documenttypeworkflow': {
'Meta': {'unique_together': "((u'document_type', u'workflow'),)", 'object_name': 'DocumentTypeWorkflow'},

View File

@@ -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
@@ -17,7 +16,6 @@ class Migration(SchemaMigration):
# Adding unique constraint on 'WorkflowTransition', fields ['workflow', 'label', 'origin_state', 'destination_state']
db.create_unique(u'document_states_workflowtransition', ['workflow_id', 'label', 'origin_state_id', 'destination_state_id'])
def backwards(self, orm):
# Removing unique constraint on 'WorkflowTransition', fields ['workflow', 'label', 'origin_state', 'destination_state']
db.delete_unique(u'document_states_workflowtransition', ['workflow_id', 'label', 'origin_state_id', 'destination_state_id'])
@@ -28,7 +26,6 @@ class Migration(SchemaMigration):
# Adding unique constraint on 'WorkflowTransition', fields ['workflow', 'origin_state', 'destination_state']
db.create_unique(u'document_states_workflowtransition', ['workflow_id', 'origin_state_id', 'destination_state_id'])
models = {
u'document_states.documenttypeworkflow': {
'Meta': {'unique_together': "((u'document_type', u'workflow'),)", 'object_name': 'DocumentTypeWorkflow'},

View File

@@ -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
@@ -23,7 +22,6 @@ class Migration(SchemaMigration):
))
db.create_unique(m2m_table_name, ['workflow_id', 'documenttype_id'])
def backwards(self, orm):
# Adding model 'DocumentTypeWorkflow'
db.create_table(u'document_states_documenttypeworkflow', (
@@ -39,7 +37,6 @@ class Migration(SchemaMigration):
# Removing M2M table for field document_types on 'Workflow'
db.delete_table(db.shorten_name(u'document_states_workflow_document_types'))
models = {
u'document_states.workflow': {
'Meta': {'object_name': 'Workflow'},

View File

@@ -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
@@ -18,7 +17,6 @@ class Migration(SchemaMigration):
self.gf('django.db.models.fields.TextField')(default='', blank=True),
keep_default=False)
def backwards(self, orm):
# Deleting field 'WorkflowInstanceLogEntry.user'
db.delete_column(u'document_states_workflowinstancelogentry', 'user_id')
@@ -26,7 +24,6 @@ class Migration(SchemaMigration):
# Deleting field 'WorkflowInstanceLogEntry.comment'
db.delete_column(u'document_states_workflowinstancelogentry', 'comment')
models = {
u'auth.group': {
'Meta': {'object_name': 'Group'},

View File

@@ -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,12 +10,10 @@ class Migration(SchemaMigration):
# Adding index on 'WorkflowInstanceLogEntry', fields ['datetime']
db.create_index(u'document_states_workflowinstancelogentry', ['datetime'])
def backwards(self, orm):
# Removing index on 'WorkflowInstanceLogEntry', fields ['datetime']
db.delete_index(u'document_states_workflowinstancelogentry', ['datetime'])
models = {
u'auth.group': {
'Meta': {'object_name': 'Group'},

View File

@@ -1,24 +1,20 @@
from __future__ import absolute_import, unicode_literals
from django.conf import settings
from django.contrib import messages
from django.core.exceptions import PermissionDenied
from django.core.urlresolvers import reverse, reverse_lazy
from django.db.utils import IntegrityError
from django.http import HttpResponseRedirect
from django.shortcuts import render_to_response, get_object_or_404
from django.template import RequestContext
from django.utils.http import urlencode
from django.utils.translation import ugettext_lazy as _, ungettext
from django.shortcuts import get_object_or_404
from django.utils.translation import ugettext_lazy as _
from django.views.generic import FormView
from acls.models import AccessEntry
from common.utils import encapsulate, generate_choices_w_labels
from common.utils import generate_choices_w_labels
from common.views import (
SingleObjectCreateView, SingleObjectDeleteView, SingleObjectEditView,
SingleObjectListView, assign_remove
)
from common.widgets import two_state_template
from documents.models import Document
from permissions.models import Permission
@@ -82,7 +78,8 @@ class WorkflowInstanceDetailView(SingleObjectListView):
return self.get_workflow_instance().log_entries.order_by('-datetime')
def get_context_data(self, **kwargs):
form = WorkflowInstanceDetailForm(instance=self.get_workflow_instance(), extra_fields=[
form = WorkflowInstanceDetailForm(
instance=self.get_workflow_instance(), extra_fields=[
{'label': _('Current state'), 'field': 'get_current_state'},
{'label': _('Last transition'), 'field': 'get_last_transition'},
]

View File

@@ -8,11 +8,6 @@ import os
import tempfile
import uuid
try:
from cStringIO import StringIO
except ImportError:
from StringIO import StringIO
from django.db import models
from django.contrib.auth.models import User
from django.core.exceptions import ValidationError

View File

@@ -1,5 +1,4 @@
# -*- coding: utf-8 -*-
import datetime
from south.db import db
from south.v2 import SchemaMigration
from django.db import models

View File

@@ -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

View File

@@ -1,5 +1,4 @@
# -*- coding: utf-8 -*-
from south.utils import datetime_utils as datetime
from south.db import db
from south.v2 import DataMigration
from django.db import models

View File

@@ -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

View File

@@ -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

View File

@@ -1,5 +1,4 @@
# -*- coding: utf-8 -*-
from south.utils import datetime_utils as datetime
from south.db import db
from south.v2 import DataMigration
from django.db import models

View File

@@ -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
@@ -20,7 +19,6 @@ class Migration(SchemaMigration):
# Deleting field 'DocumentVersion.minor'
db.delete_column(u'documents_documentversion', 'minor')
def backwards(self, orm):
# Adding field 'DocumentVersion.major'
db.add_column(u'documents_documentversion', 'major',
@@ -40,7 +38,6 @@ class Migration(SchemaMigration):
# Adding unique constraint on 'DocumentVersion', fields ['document', 'major', 'minor', 'micro']
db.create_unique(u'documents_documentversion', ['document_id', 'major', 'minor', 'micro'])
models = {
u'auth.group': {
'Meta': {'object_name': 'Group'},

View File

@@ -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,12 +10,10 @@ class Migration(SchemaMigration):
# Adding unique constraint on 'DocumentTypeFilename', fields ['document_type', 'filename']
db.create_unique(u'documents_documenttypefilename', ['document_type_id', 'filename'])
def backwards(self, orm):
# Removing unique constraint on 'DocumentTypeFilename', fields ['document_type', 'filename']
db.delete_unique(u'documents_documenttypefilename', ['document_type_id', 'filename'])
models = {
u'auth.group': {
'Meta': {'object_name': 'Group'},

View File

@@ -1,5 +1,4 @@
# -*- coding: utf-8 -*-
from south.utils import datetime_utils as datetime
from south.db import db
from south.v2 import DataMigration
from django.db import models

View File

@@ -462,7 +462,6 @@ def document_multiple_download(request):
def document_update_page_count(request, document_id=None, document_id_list=None):
if document_id:
documents = [get_object_or_404(Document.objects, pk=document_id)]
post_redirect = documents[0].get_absolute_url()
elif document_id_list:
documents = [get_object_or_404(Document, pk=document_id) for document_id in document_id_list.split(',')]
else:

View File

@@ -1,7 +1,6 @@
from __future__ import unicode_literals
from django import forms
from django.conf import settings
from django.contrib.staticfiles.templatetags.staticfiles import static
from django.core.urlresolvers import reverse
from django.utils.html import strip_tags

View File

@@ -1,8 +1,5 @@
from __future__ import unicode_literals
import os
from django.conf import settings
from django.contrib.auth.models import User
from django.core.files.base import File
from django.core.urlresolvers import reverse
@@ -10,9 +7,10 @@ from django.test.client import Client
from django.test import TestCase
from documents.models import Document, DocumentType
from documents.tests import (TEST_ADMIN_PASSWORD, TEST_ADMIN_USERNAME,
TEST_ADMIN_EMAIL, TEST_DOCUMENT_PATH,
TEST_DOCUMENT_TYPE, TEST_SMALL_DOCUMENT_PATH)
from documents.tests import (
TEST_ADMIN_PASSWORD, TEST_ADMIN_USERNAME, TEST_ADMIN_EMAIL,
TEST_DOCUMENT_PATH, TEST_DOCUMENT_TYPE, TEST_SMALL_DOCUMENT_PATH
)
from .classes import SearchModel

View File

@@ -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
@@ -15,12 +14,10 @@ class Migration(SchemaMigration):
))
db.send_create_signal(u'events', ['EventType'])
def backwards(self, orm):
# Deleting model 'EventType'
db.delete_table(u'events_eventtype')
models = {
u'events.eventtype': {
'Meta': {'object_name': 'EventType'},

View File

@@ -1,7 +1,6 @@
# -*- coding: utf-8 -*-
import json
from south.utils import datetime_utils as datetime
from south.db import db
from south.v2 import DataMigration
from django.db import models

View File

@@ -1,5 +1,4 @@
# -*- coding: utf-8 -*-
from south.utils import datetime_utils as datetime
from south.db import db
from south.v2 import DataMigration
from django.db import models

View File

@@ -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

View File

@@ -1 +0,0 @@

View File

@@ -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
@@ -30,7 +29,6 @@ class Migration(SchemaMigration):
))
db.send_create_signal(u'history', ['History'])
def backwards(self, orm):
# Removing unique constraint on 'HistoryType', fields ['namespace', 'name']
db.delete_unique(u'history_historytype', ['namespace', 'name'])
@@ -41,7 +39,6 @@ class Migration(SchemaMigration):
# Deleting model 'History'
db.delete_table(u'history_history')
models = {
u'contenttypes.contenttype': {
'Meta': {'ordering': "('name',)", 'unique_together': "(('app_label', 'model'),)", 'object_name': 'ContentType', 'db_table': "'django_content_type'"},

View File

@@ -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

View File

@@ -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
@@ -20,7 +19,6 @@ class Migration(SchemaMigration):
# Deleting model 'HistoryType'
db.delete_table(u'history_historytype')
def backwards(self, orm):
# Adding model 'History'
db.create_table(u'history_history', (
@@ -44,9 +42,6 @@ class Migration(SchemaMigration):
# Adding unique constraint on 'HistoryType', fields ['namespace', 'name']
db.create_unique(u'history_historytype', ['namespace', 'name'])
models = {
}
models = {}
complete_apps = ['history']

View File

@@ -64,7 +64,8 @@ def smart_link_instances_for_document(request, document_id):
queryset = SmartLink.objects.get_for(document)
except Exception as exception:
queryset = []
messages.error(request, _('Error calculating smart link for: %(document)s; %(exception)s.') %
messages.error(
request, _('Error calculating smart link for: %(document)s; %(exception)s.') %
{'document': document, 'exception': exception}
)

View File

@@ -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

View File

@@ -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

View File

@@ -1,8 +1,6 @@
from __future__ import absolute_import, unicode_literals
from django.core.exceptions import PermissionDenied
from django.core.urlresolvers import reverse
from django.http import HttpResponseRedirect
from django.shortcuts import render_to_response
from django.template import RequestContext
from django.utils.translation import ugettext_lazy as _

View File

@@ -4,7 +4,6 @@ from django.core.exceptions import PermissionDenied
from django.shortcuts import get_object_or_404
from rest_framework import generics, status, views
from rest_framework.parsers import JSONParser
from rest_framework.response import Response
from acls.models import AccessEntry
@@ -12,7 +11,6 @@ from documents.models import Document, DocumentType
from documents.permissions import (
PERMISSION_DOCUMENT_TYPE_VIEW, PERMISSION_DOCUMENT_TYPE_EDIT
)
from permissions.models import Permission
from rest_api.filters import MayanObjectPermissionsFilter
from rest_api.permissions import MayanPermission
@@ -25,9 +23,8 @@ from .permissions import (
PERMISSION_METADATA_TYPE_EDIT, PERMISSION_METADATA_TYPE_VIEW
)
from .serializers import (
DocumentMetadataSerializer, DocumentNewMetadataSerializer,
DocumentTypeNewMetadataTypeSerializer, MetadataTypeSerializer,
DocumentTypeMetadataTypeSerializer
DocumentMetadataSerializer, DocumentTypeNewMetadataTypeSerializer,
MetadataTypeSerializer, DocumentTypeMetadataTypeSerializer
)
@@ -155,7 +152,6 @@ class APIDocumentMetadataView(generics.RetrieveUpdateDestroyAPIView):
return Response(status=status.HTTP_400_BAD_REQUEST, data={'non_fields_errors': unicode(exception)})
class APIDocumentTypeMetadataTypeOptionalListView(generics.ListCreateAPIView):
permission_classes = (MayanPermission,)

View File

@@ -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
@@ -17,7 +16,6 @@ class Migration(SchemaMigration):
# Removing M2M table for field default_metadata_sets on 'DocumentTypeDefaults'
db.delete_table(db.shorten_name(u'metadata_documenttypedefaults_default_metadata_sets'))
# Changing field 'DocumentMetadata.value'
db.alter_column(u'metadata_documentmetadata', 'value', self.gf('django.db.models.fields.CharField')(max_length=255))
@@ -46,7 +44,6 @@ class Migration(SchemaMigration):
))
db.create_unique(m2m_table_name, ['documenttypedefaults_id', 'metadataset_id'])
# Changing field 'DocumentMetadata.value'
db.alter_column(u'metadata_documentmetadata', 'value', self.gf('django.db.models.fields.CharField')(max_length=256))

View File

@@ -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

View File

@@ -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
@@ -20,7 +19,6 @@ class Migration(SchemaMigration):
# Removing M2M table for field default_metadata on 'DocumentTypeDefaults'
db.delete_table(db.shorten_name(u'metadata_documenttypedefaults_default_metadata'))
def backwards(self, orm):
# Deleting model 'DocumentTypeMetadataTypeOptions'
db.delete_table(u'metadata_documenttypemetadatatypeoptions')
@@ -34,7 +32,6 @@ class Migration(SchemaMigration):
))
db.create_unique(m2m_table_name, ['documenttypedefaults_id', 'metadatatype_id'])
models = {
u'documents.document': {
'Meta': {'ordering': "['-date_added']", 'object_name': 'Document'},

View File

@@ -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
@@ -23,7 +22,6 @@ class Migration(SchemaMigration):
))
db.send_create_signal(u'metadata', ['DocumentTypeMetadataType'])
def backwards(self, orm):
# Adding model 'DocumentTypeDefaults'
db.create_table(u'metadata_documenttypedefaults', (
@@ -44,7 +42,6 @@ class Migration(SchemaMigration):
# Deleting model 'DocumentTypeMetadataType'
db.delete_table(u'metadata_documenttypemetadatatype')
models = {
u'documents.document': {
'Meta': {'ordering': "['-date_added']", 'object_name': 'Document'},

View File

@@ -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,12 +10,10 @@ class Migration(SchemaMigration):
# Adding unique constraint on 'DocumentTypeMetadataType', fields ['document_type', 'metadata_type']
db.create_unique(u'metadata_documenttypemetadatatype', ['document_type_id', 'metadata_type_id'])
def backwards(self, orm):
# Removing unique constraint on 'DocumentTypeMetadataType', fields ['document_type', 'metadata_type']
db.delete_unique(u'metadata_documenttypemetadatatype', ['document_type_id', 'metadata_type_id'])
models = {
u'documents.document': {
'Meta': {'ordering': "['-date_added']", 'object_name': 'Document'},

View File

@@ -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

View File

@@ -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,12 +10,10 @@ class Migration(SchemaMigration):
# Adding unique constraint on 'DocumentMetadata', fields ['document', 'metadata_type']
db.create_unique(u'metadata_documentmetadata', ['document_id', 'metadata_type_id'])
def backwards(self, orm):
# Removing unique constraint on 'DocumentMetadata', fields ['document', 'metadata_type']
db.delete_unique(u'metadata_documentmetadata', ['document_id', 'metadata_type_id'])
models = {
u'documents.document': {
'Meta': {'ordering': "['-date_added']", 'object_name': 'Document'},

View File

@@ -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
@@ -13,12 +12,10 @@ class Migration(SchemaMigration):
self.gf('django.db.models.fields.CharField')(default='', max_length=64),
keep_default=False)
def backwards(self, orm):
# Deleting field 'MetadataType.validation'
db.delete_column(u'metadata_metadatatype', 'validation')
models = {
u'documents.document': {
'Meta': {'ordering': "['-date_added']", 'object_name': 'Document'},

View File

@@ -20,4 +20,3 @@ def task_add_required_metadata_type(document_type_id, metadata_type_id):
for document in DocumentType.objects.get(pk=document_type_id).documents.all():
document.metadata.create(metadata_type=metadata_type)

View File

@@ -5,16 +5,16 @@ from django.contrib import messages
from django.core.exceptions import PermissionDenied
from django.core.urlresolvers import reverse
from django.http import HttpResponseRedirect, Http404
from django.shortcuts import (get_list_or_404, get_object_or_404,
render_to_response)
from django.shortcuts import get_object_or_404, render_to_response
from django.template import RequestContext
from django.utils.http import urlencode
from django.utils.translation import ugettext_lazy as _, ungettext
from acls.models import AccessEntry
from documents.models import Document, DocumentType
from documents.permissions import (PERMISSION_DOCUMENT_TYPE_EDIT,
PERMISSION_DOCUMENT_VIEW)
from documents.permissions import (
PERMISSION_DOCUMENT_TYPE_EDIT, PERMISSION_DOCUMENT_VIEW
)
from documents.views import document_list
from permissions.models import Permission
@@ -228,9 +228,9 @@ def metadata_remove(request, document_id=None, document_id_list=None):
documents = Document.objects.select_related('metadata').filter(pk__in=document_id_list.split(','))
try:
Permission.objects.check_permissions(request.user, [PERMISSION_METADATA_DOCUMENT_EDIT])
Permission.objects.check_permissions(request.user, [PERMISSION_METADATA_DOCUMENT_REMOVE])
except PermissionDenied:
documents = AccessEntry.objects.filter_objects_by_access(PERMISSION_METADATA_DOCUMENT_EDIT, request.user, documents)
documents = AccessEntry.objects.filter_objects_by_access(PERMISSION_METADATA_DOCUMENT_REMOVE, request.user, documents)
if not documents:
if document_id:

View File

@@ -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

View File

@@ -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
@@ -23,7 +22,6 @@ class Migration(SchemaMigration):
))
db.send_create_signal(u'ocr', ['DocumentVersionOCRError'])
def backwards(self, orm):
# Adding model 'DocumentQueue'
db.create_table(u'ocr_documentqueue', (
@@ -47,7 +45,6 @@ class Migration(SchemaMigration):
# Deleting model 'DocumentVersionOCRError'
db.delete_table(u'ocr_documentversionocrerror')
models = {
u'documents.document': {
'Meta': {'ordering': "['-date_added']", 'object_name': 'Document'},

View File

@@ -1,13 +1,15 @@
from __future__ import unicode_literals
from rest_framework import generics, views
from rest_framework import generics
from rest_api.filters import MayanObjectPermissionsFilter
from rest_api.permissions import MayanPermission
from .models import Role
from .permissions import (PERMISSION_ROLE_CREATE, PERMISSION_ROLE_DELETE,
PERMISSION_ROLE_EDIT, PERMISSION_ROLE_VIEW)
from .permissions import (
PERMISSION_ROLE_CREATE, PERMISSION_ROLE_DELETE, PERMISSION_ROLE_EDIT,
PERMISSION_ROLE_VIEW
)
from .serializers import RoleSerializer

View File

@@ -106,7 +106,6 @@ def role_permissions(request, role_id):
def permission_grant(request):
Permission.objects.check_permissions(request.user, [PERMISSION_PERMISSION_GRANT])
items_property_list = loads(request.GET.get('items_property_list', []))
post_action_redirect = None
next = request.POST.get('next', request.GET.get('next', request.META.get('HTTP_REFERER', reverse(settings.LOGIN_REDIRECT_URL))))
previous = request.POST.get('previous', request.GET.get('previous', request.META.get('HTTP_REFERER', reverse(settings.LOGIN_REDIRECT_URL))))
@@ -167,7 +166,6 @@ def permission_grant(request):
def permission_revoke(request):
Permission.objects.check_permissions(request.user, [PERMISSION_PERMISSION_REVOKE])
items_property_list = loads(request.GET.get('items_property_list', []))
post_action_redirect = None
next = request.POST.get('next', request.GET.get('next', request.META.get('HTTP_REFERER', None)))
previous = request.POST.get('previous', request.GET.get('previous', request.META.get('HTTP_REFERER', None)))

View File

@@ -7,7 +7,6 @@ from django.utils.translation import ugettext
from django.utils.translation import ugettext_lazy as _
from documents.forms import DocumentForm
from documents.models import DocumentVersion
from .models import (
IMAPEmail, POP3Email, SourceTransformation, StagingFolderSource,
@@ -24,7 +23,6 @@ class NewDocumentForm(DocumentForm):
class NewVersionForm(forms.Form):
def __init__(self, *args, **kwargs):
document = kwargs.pop('document')
super(NewVersionForm, self).__init__(*args, **kwargs)
self.fields['comment'] = forms.CharField(

View File

@@ -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
@@ -42,7 +41,6 @@ class Migration(SchemaMigration):
))
db.send_create_signal(u'sources', ['EmailBaseModel'])
def backwards(self, orm):
# Deleting model 'IMAPEmail'
db.delete_table(u'sources_imapemail')
@@ -56,7 +54,6 @@ class Migration(SchemaMigration):
# Deleting model 'EmailBaseModel'
db.delete_table(u'sources_emailbasemodel')
models = {
u'contenttypes.contenttype': {
'Meta': {'ordering': "('name',)", 'unique_together': "(('app_label', 'model'),)", 'object_name': 'ContentType', 'db_table': "'django_content_type'"},

View File

@@ -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

View File

@@ -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

View File

@@ -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

View File

@@ -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

View File

@@ -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

View File

@@ -1,10 +1,6 @@
from __future__ import unicode_literals
from json import loads
from django.conf import settings
from django.contrib.auth.models import User
from django.core.files.base import File
from django.core.urlresolvers import reverse
from django.test.client import Client
from django.test import TestCase
@@ -13,11 +9,12 @@ from documents.models import Document, DocumentType
from sources.literals import SOURCE_CHOICE_WEB_FORM
from sources.models import WebFormSource
from documents.tests import (TEST_ADMIN_PASSWORD, TEST_ADMIN_USERNAME,
TEST_ADMIN_EMAIL, TEST_SMALL_DOCUMENT_FILENAME,
TEST_DOCUMENT_PATH, TEST_SIGNED_DOCUMENT_PATH,
TEST_SMALL_DOCUMENT_PATH,
TEST_DOCUMENT_DESCRIPTION, TEST_DOCUMENT_TYPE)
from documents.tests import (
TEST_ADMIN_PASSWORD, TEST_ADMIN_USERNAME, TEST_ADMIN_EMAIL,
TEST_SMALL_DOCUMENT_FILENAME, TEST_DOCUMENT_PATH,
TEST_SIGNED_DOCUMENT_PATH, TEST_SMALL_DOCUMENT_PATH,
TEST_DOCUMENT_DESCRIPTION, TEST_DOCUMENT_TYPE
)
class UploadDocumentTestCase(TestCase):

View File

@@ -1,6 +1,5 @@
from __future__ import unicode_literals
from django.conf import settings
from django.contrib.staticfiles.templatetags.staticfiles import static
from django.core.urlresolvers import reverse
from django.utils.html import strip_tags

View File

@@ -32,7 +32,6 @@ logger = logging.getLogger(__name__)
def tag_create(request):
Permission.objects.check_permissions(request.user, [PERMISSION_TAG_CREATE])
redirect_url = reverse('tags:tag_list')
previous = request.POST.get('previous', request.GET.get('previous', request.META.get('HTTP_REFERER', redirect_url)))
if request.method == 'POST':
form = TagForm(request.POST)

View File

@@ -2,9 +2,7 @@ from __future__ import unicode_literals
from django.contrib.auth.models import User, Group
from navigation.api import register_links
from navigation.links import link_spacer
from project_setup.api import register_setup
from rest_api.classes import APIEndPoint
@@ -27,5 +25,3 @@ register_setup(user_setup)
register_setup(group_setup)
APIEndPoint('users', app_name='user_management')