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

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

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

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

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

3
mayan/apps/common/south_migrations/0006_auto__add_shareduploadedfile.py
View File

@@ -1,5 +1,4 @@
# -*- coding: utf-8 -*- # -*- coding: utf-8 -*-
from south.utils import datetime_utils as datetime
from south.db import db from south.db import db
from south.v2 import SchemaMigration from south.v2 import SchemaMigration
from django.db import models from django.db import models
@@ -15,12 +14,10 @@ class Migration(SchemaMigration):
)) ))
db.send_create_signal(u'common', ['SharedUploadedFile']) db.send_create_signal(u'common', ['SharedUploadedFile'])
def backwards(self, orm): def backwards(self, orm):
# Deleting model 'SharedUploadedFile' # Deleting model 'SharedUploadedFile'
db.delete_table(u'common_shareduploadedfile') db.delete_table(u'common_shareduploadedfile')
models = { models = {
u'auth.group': { u'auth.group': {
'Meta': {'object_name': 'Group'}, 'Meta': {'object_name': 'Group'},

3
mayan/apps/common/south_migrations/0007_auto__add_field_shareduploadedfile_filename.py
View File

@@ -1,5 +1,4 @@
# -*- coding: utf-8 -*- # -*- coding: utf-8 -*-
from south.utils import datetime_utils as datetime
from south.db import db from south.db import db
from south.v2 import SchemaMigration from south.v2 import SchemaMigration
from django.db import models from django.db import models
@@ -13,12 +12,10 @@ class Migration(SchemaMigration):
self.gf('django.db.models.fields.CharField')(default='', max_length=255), self.gf('django.db.models.fields.CharField')(default='', max_length=255),
keep_default=False) keep_default=False)
def backwards(self, orm): def backwards(self, orm):
# Deleting field 'SharedUploadedFile.filename' # Deleting field 'SharedUploadedFile.filename'
db.delete_column(u'common_shareduploadedfile', 'filename') db.delete_column(u'common_shareduploadedfile', 'filename')
models = { models = {
u'auth.group': { u'auth.group': {
'Meta': {'object_name': 'Group'}, 'Meta': {'object_name': 'Group'},

2
mayan/apps/common/south_migrations/0008_auto__add_field_shareduploadedfile_datatime.py
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), self.gf('django.db.models.fields.DateTimeField')(auto_now_add=True, default=datetime.datetime(2014, 10, 29, 0, 0), blank=True),
keep_default=False) keep_default=False)
def backwards(self, orm): def backwards(self, orm):
# Deleting field 'SharedUploadedFile.datatime' # Deleting field 'SharedUploadedFile.datatime'
db.delete_column(u'common_shareduploadedfile', 'datatime') db.delete_column(u'common_shareduploadedfile', 'datatime')
models = { models = {
u'auth.group': { u'auth.group': {
'Meta': {'object_name': 'Group'}, 'Meta': {'object_name': 'Group'},

3
mayan/apps/common/south_migrations/0009_auto__add_userlocaleprofile.py
View File

@@ -1,5 +1,4 @@
# -*- coding: utf-8 -*- # -*- coding: utf-8 -*-
from south.utils import datetime_utils as datetime
from south.db import db from south.db import db
from south.v2 import SchemaMigration from south.v2 import SchemaMigration
from django.db import models from django.db import models
@@ -17,12 +16,10 @@ class Migration(SchemaMigration):
)) ))
db.send_create_signal(u'common', ['UserLocaleProfile']) db.send_create_signal(u'common', ['UserLocaleProfile'])
def backwards(self, orm): def backwards(self, orm):
# Deleting model 'UserLocaleProfile' # Deleting model 'UserLocaleProfile'
db.delete_table(u'common_userlocaleprofile') db.delete_table(u'common_userlocaleprofile')
models = { models = {
u'auth.group': { u'auth.group': {
'Meta': {'object_name': 'Group'}, 'Meta': {'object_name': 'Group'},

1
mayan/apps/common/south_migrations/0010_create_locale_profiles.py
View File

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

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

1
mayan/apps/converter/backends/python.py
View File

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

1
mayan/apps/django_gpg/api.py
View File

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

1
mayan/apps/document_indexing/api.py
View File

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

3
mayan/apps/document_indexing/south_migrations/0007_auto__del_documentrenamecount.py
View File

@@ -1,5 +1,4 @@
# -*- coding: utf-8 -*- # -*- coding: utf-8 -*-
from south.utils import datetime_utils as datetime
from south.db import db from south.db import db
from south.v2 import SchemaMigration from south.v2 import SchemaMigration
from django.db import models from django.db import models
@@ -11,7 +10,6 @@ class Migration(SchemaMigration):
# Deleting model 'DocumentRenameCount' # Deleting model 'DocumentRenameCount'
db.delete_table(u'document_indexing_documentrenamecount') db.delete_table(u'document_indexing_documentrenamecount')
def backwards(self, orm): def backwards(self, orm):
# Adding model 'DocumentRenameCount' # Adding model 'DocumentRenameCount'
db.create_table(u'document_indexing_documentrenamecount', ( db.create_table(u'document_indexing_documentrenamecount', (
@@ -22,7 +20,6 @@ class Migration(SchemaMigration):
)) ))
db.send_create_signal('document_indexing', ['DocumentRenameCount']) db.send_create_signal('document_indexing', ['DocumentRenameCount'])
models = { models = {
u'document_indexing.index': { u'document_indexing.index': {
'Meta': {'object_name': 'Index'}, 'Meta': {'object_name': 'Index'},

3
mayan/apps/document_states/links.py
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_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_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'} link_workflow_instance_transition = {'text': _('Transition'), 'view': 'document_states:workflow_instance_transition', 'args': 'workflow_instance.pk', 'famfam': 'table_lightning'}

3
mayan/apps/document_states/south_migrations/0001_initial.py
View File

@@ -1,5 +1,4 @@
# -*- coding: utf-8 -*- # -*- coding: utf-8 -*-
from south.utils import datetime_utils as datetime
from south.db import db from south.db import db
from south.v2 import SchemaMigration from south.v2 import SchemaMigration
from django.db import models from django.db import models
@@ -64,7 +63,6 @@ class Migration(SchemaMigration):
)) ))
db.send_create_signal(u'document_states', ['WorkflowInstanceLogEntry']) db.send_create_signal(u'document_states', ['WorkflowInstanceLogEntry'])
def backwards(self, orm): def backwards(self, orm):
# Removing unique constraint on 'WorkflowInstance', fields ['document', 'workflow'] # Removing unique constraint on 'WorkflowInstance', fields ['document', 'workflow']
db.delete_unique(u'document_states_workflowinstance', ['document_id', 'workflow_id']) db.delete_unique(u'document_states_workflowinstance', ['document_id', 'workflow_id'])
@@ -90,7 +88,6 @@ class Migration(SchemaMigration):
# Deleting model 'WorkflowInstanceLogEntry' # Deleting model 'WorkflowInstanceLogEntry'
db.delete_table(u'document_states_workflowinstancelogentry') db.delete_table(u'document_states_workflowinstancelogentry')
models = { models = {
u'document_states.documenttypeworkflow': { u'document_states.documenttypeworkflow': {
'Meta': {'unique_together': "((u'document_type', u'workflow'),)", 'object_name': 'DocumentTypeWorkflow'}, 'Meta': {'unique_together': "((u'document_type', u'workflow'),)", 'object_name': 'DocumentTypeWorkflow'},

3
mayan/apps/document_states/south_migrations/0002_auto__add_field_workflowtransition_workflow.py
View File

@@ -1,5 +1,4 @@
# -*- coding: utf-8 -*- # -*- coding: utf-8 -*-
from south.utils import datetime_utils as datetime
from south.db import db from south.db import db
from south.v2 import SchemaMigration from south.v2 import SchemaMigration
from django.db import models 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']), self.gf('django.db.models.fields.related.ForeignKey')(default=1, to=orm['document_states.Workflow']),
keep_default=False) keep_default=False)
def backwards(self, orm): def backwards(self, orm):
# Deleting field 'WorkflowTransition.workflow' # Deleting field 'WorkflowTransition.workflow'
db.delete_column(u'document_states_workflowtransition', 'workflow_id') db.delete_column(u'document_states_workflowtransition', 'workflow_id')
models = { models = {
u'document_states.documenttypeworkflow': { u'document_states.documenttypeworkflow': {
'Meta': {'unique_together': "((u'document_type', u'workflow'),)", 'object_name': 'DocumentTypeWorkflow'}, 'Meta': {'unique_together': "((u'document_type', u'workflow'),)", 'object_name': 'DocumentTypeWorkflow'},

3
mayan/apps/document_states/south_migrations/0003_auto__add_unique_workflowtransition_workflow_origin_state_destination_.py
View File

@@ -1,5 +1,4 @@
# -*- coding: utf-8 -*- # -*- coding: utf-8 -*-
from south.utils import datetime_utils as datetime
from south.db import db from south.db import db
from south.v2 import SchemaMigration from south.v2 import SchemaMigration
from django.db import models from django.db import models
@@ -11,12 +10,10 @@ class Migration(SchemaMigration):
# Adding unique constraint on 'WorkflowTransition', fields ['workflow', 'origin_state', 'destination_state'] # 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']) db.create_unique(u'document_states_workflowtransition', ['workflow_id', 'origin_state_id', 'destination_state_id'])
def backwards(self, orm): def backwards(self, orm):
# Removing unique constraint on 'WorkflowTransition', fields ['workflow', 'origin_state', 'destination_state'] # 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']) db.delete_unique(u'document_states_workflowtransition', ['workflow_id', 'origin_state_id', 'destination_state_id'])
models = { models = {
u'document_states.documenttypeworkflow': { u'document_states.documenttypeworkflow': {
'Meta': {'unique_together': "((u'document_type', u'workflow'),)", 'object_name': 'DocumentTypeWorkflow'}, 'Meta': {'unique_together': "((u'document_type', u'workflow'),)", 'object_name': 'DocumentTypeWorkflow'},

3
mayan/apps/document_states/south_migrations/0004_auto__del_field_workflowinstancelogentry_document__del_field_workflowi.py
View File

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

3
mayan/apps/document_states/south_migrations/0005_auto__del_unique_workflowstate_label__add_unique_workflowstate_workflo.py
View File

@@ -1,5 +1,4 @@
# -*- coding: utf-8 -*- # -*- coding: utf-8 -*-
from south.utils import datetime_utils as datetime
from south.db import db from south.db import db
from south.v2 import SchemaMigration from south.v2 import SchemaMigration
from django.db import models from django.db import models
@@ -14,7 +13,6 @@ class Migration(SchemaMigration):
# Adding unique constraint on 'WorkflowState', fields ['workflow', 'label'] # Adding unique constraint on 'WorkflowState', fields ['workflow', 'label']
db.create_unique(u'document_states_workflowstate', ['workflow_id', 'label']) db.create_unique(u'document_states_workflowstate', ['workflow_id', 'label'])
def backwards(self, orm): def backwards(self, orm):
# Removing unique constraint on 'WorkflowState', fields ['workflow', 'label'] # Removing unique constraint on 'WorkflowState', fields ['workflow', 'label']
db.delete_unique(u'document_states_workflowstate', ['workflow_id', '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'] # Adding unique constraint on 'WorkflowState', fields ['label']
db.create_unique(u'document_states_workflowstate', ['label']) db.create_unique(u'document_states_workflowstate', ['label'])
models = { models = {
u'document_states.documenttypeworkflow': { u'document_states.documenttypeworkflow': {
'Meta': {'unique_together': "((u'document_type', u'workflow'),)", 'object_name': 'DocumentTypeWorkflow'}, 'Meta': {'unique_together': "((u'document_type', u'workflow'),)", 'object_name': 'DocumentTypeWorkflow'},

3
mayan/apps/document_states/south_migrations/0006_auto__del_unique_workflowtransition_label__del_unique_workflowtransiti.py
View File

@@ -1,5 +1,4 @@
# -*- coding: utf-8 -*- # -*- coding: utf-8 -*-
from south.utils import datetime_utils as datetime
from south.db import db from south.db import db
from south.v2 import SchemaMigration from south.v2 import SchemaMigration
from django.db import models from django.db import models
@@ -17,7 +16,6 @@ class Migration(SchemaMigration):
# Adding unique constraint on 'WorkflowTransition', fields ['workflow', 'label', 'origin_state', 'destination_state'] # 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']) db.create_unique(u'document_states_workflowtransition', ['workflow_id', 'label', 'origin_state_id', 'destination_state_id'])
def backwards(self, orm): def backwards(self, orm):
# Removing unique constraint on 'WorkflowTransition', fields ['workflow', 'label', 'origin_state', 'destination_state'] # 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']) 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'] # 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']) db.create_unique(u'document_states_workflowtransition', ['workflow_id', 'origin_state_id', 'destination_state_id'])
models = { models = {
u'document_states.documenttypeworkflow': { u'document_states.documenttypeworkflow': {
'Meta': {'unique_together': "((u'document_type', u'workflow'),)", 'object_name': 'DocumentTypeWorkflow'}, 'Meta': {'unique_together': "((u'document_type', u'workflow'),)", 'object_name': 'DocumentTypeWorkflow'},

3
mayan/apps/document_states/south_migrations/0007_auto__del_documenttypeworkflow__del_unique_documenttypeworkflow_docume.py
View File

@@ -1,5 +1,4 @@
# -*- coding: utf-8 -*- # -*- coding: utf-8 -*-
from south.utils import datetime_utils as datetime
from south.db import db from south.db import db
from south.v2 import SchemaMigration from south.v2 import SchemaMigration
from django.db import models from django.db import models
@@ -23,7 +22,6 @@ class Migration(SchemaMigration):
)) ))
db.create_unique(m2m_table_name, ['workflow_id', 'documenttype_id']) db.create_unique(m2m_table_name, ['workflow_id', 'documenttype_id'])
def backwards(self, orm): def backwards(self, orm):
# Adding model 'DocumentTypeWorkflow' # Adding model 'DocumentTypeWorkflow'
db.create_table(u'document_states_documenttypeworkflow', ( db.create_table(u'document_states_documenttypeworkflow', (
@@ -39,7 +37,6 @@ class Migration(SchemaMigration):
# Removing M2M table for field document_types on 'Workflow' # Removing M2M table for field document_types on 'Workflow'
db.delete_table(db.shorten_name(u'document_states_workflow_document_types')) db.delete_table(db.shorten_name(u'document_states_workflow_document_types'))
models = { models = {
u'document_states.workflow': { u'document_states.workflow': {
'Meta': {'object_name': 'Workflow'}, 'Meta': {'object_name': 'Workflow'},

3
mayan/apps/document_states/south_migrations/0008_auto__add_field_workflowinstancelogentry_user__add_field_workflowinsta.py
View File

@@ -1,5 +1,4 @@
# -*- coding: utf-8 -*- # -*- coding: utf-8 -*-
from south.utils import datetime_utils as datetime
from south.db import db from south.db import db
from south.v2 import SchemaMigration from south.v2 import SchemaMigration
from django.db import models from django.db import models
@@ -18,7 +17,6 @@ class Migration(SchemaMigration):
self.gf('django.db.models.fields.TextField')(default='', blank=True), self.gf('django.db.models.fields.TextField')(default='', blank=True),
keep_default=False) keep_default=False)
def backwards(self, orm): def backwards(self, orm):
# Deleting field 'WorkflowInstanceLogEntry.user' # Deleting field 'WorkflowInstanceLogEntry.user'
db.delete_column(u'document_states_workflowinstancelogentry', 'user_id') db.delete_column(u'document_states_workflowinstancelogentry', 'user_id')
@@ -26,7 +24,6 @@ class Migration(SchemaMigration):
# Deleting field 'WorkflowInstanceLogEntry.comment' # Deleting field 'WorkflowInstanceLogEntry.comment'
db.delete_column(u'document_states_workflowinstancelogentry', 'comment') db.delete_column(u'document_states_workflowinstancelogentry', 'comment')
models = { models = {
u'auth.group': { u'auth.group': {
'Meta': {'object_name': 'Group'}, 'Meta': {'object_name': 'Group'},

3
mayan/apps/document_states/south_migrations/0009_auto__add_index_workflowinstancelogentry_datetime.py
View File

@@ -1,5 +1,4 @@
# -*- coding: utf-8 -*- # -*- coding: utf-8 -*-
from south.utils import datetime_utils as datetime
from south.db import db from south.db import db
from south.v2 import SchemaMigration from south.v2 import SchemaMigration
from django.db import models from django.db import models
@@ -11,12 +10,10 @@ class Migration(SchemaMigration):
# Adding index on 'WorkflowInstanceLogEntry', fields ['datetime'] # Adding index on 'WorkflowInstanceLogEntry', fields ['datetime']
db.create_index(u'document_states_workflowinstancelogentry', ['datetime']) db.create_index(u'document_states_workflowinstancelogentry', ['datetime'])
def backwards(self, orm): def backwards(self, orm):
# Removing index on 'WorkflowInstanceLogEntry', fields ['datetime'] # Removing index on 'WorkflowInstanceLogEntry', fields ['datetime']
db.delete_index(u'document_states_workflowinstancelogentry', ['datetime']) db.delete_index(u'document_states_workflowinstancelogentry', ['datetime'])
models = { models = {
u'auth.group': { u'auth.group': {
'Meta': {'object_name': 'Group'}, 'Meta': {'object_name': 'Group'},

13
mayan/apps/document_states/views.py
View File

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

5
mayan/apps/documents/models.py
View File

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

1
mayan/apps/documents/south_migrations/0018_auto__chg_field_documentpage_page_label.py
View File

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

1
mayan/apps/documents/south_migrations/0020_auto__chg_field_recentdocument_datetime_accessed__chg_field_documentve.py
View File

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

1
mayan/apps/documents/south_migrations/0022_set_doc_type.py
View File

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

1
mayan/apps/documents/south_migrations/0023_auto__chg_field_document_document_type.py
View File

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

1
mayan/apps/documents/south_migrations/0026_auto__add_field_document_label.py
View File

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

1
mayan/apps/documents/south_migrations/0027_move_filename_to_label.py
View File

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

3
mayan/apps/documents/south_migrations/0029_auto__del_field_documentversion_major__del_field_documentversion_micro.py
View File

@@ -1,5 +1,4 @@
# -*- coding: utf-8 -*- # -*- coding: utf-8 -*-
from south.utils import datetime_utils as datetime
from south.db import db from south.db import db
from south.v2 import SchemaMigration from south.v2 import SchemaMigration
from django.db import models from django.db import models
@@ -20,7 +19,6 @@ class Migration(SchemaMigration):
# Deleting field 'DocumentVersion.minor' # Deleting field 'DocumentVersion.minor'
db.delete_column(u'documents_documentversion', 'minor') db.delete_column(u'documents_documentversion', 'minor')
def backwards(self, orm): def backwards(self, orm):
# Adding field 'DocumentVersion.major' # Adding field 'DocumentVersion.major'
db.add_column(u'documents_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'] # Adding unique constraint on 'DocumentVersion', fields ['document', 'major', 'minor', 'micro']
db.create_unique(u'documents_documentversion', ['document_id', 'major', 'minor', 'micro']) db.create_unique(u'documents_documentversion', ['document_id', 'major', 'minor', 'micro'])
models = { models = {
u'auth.group': { u'auth.group': {
'Meta': {'object_name': 'Group'}, 'Meta': {'object_name': 'Group'},

3
mayan/apps/documents/south_migrations/0030_auto__add_unique_documenttypefilename_document_type_filename.py
View File

@@ -1,5 +1,4 @@
# -*- coding: utf-8 -*- # -*- coding: utf-8 -*-
from south.utils import datetime_utils as datetime
from south.db import db from south.db import db
from south.v2 import SchemaMigration from south.v2 import SchemaMigration
from django.db import models from django.db import models
@@ -11,12 +10,10 @@ class Migration(SchemaMigration):
# Adding unique constraint on 'DocumentTypeFilename', fields ['document_type', 'filename'] # Adding unique constraint on 'DocumentTypeFilename', fields ['document_type', 'filename']
db.create_unique(u'documents_documenttypefilename', ['document_type_id', 'filename']) db.create_unique(u'documents_documenttypefilename', ['document_type_id', 'filename'])
def backwards(self, orm): def backwards(self, orm):
# Removing unique constraint on 'DocumentTypeFilename', fields ['document_type', 'filename'] # Removing unique constraint on 'DocumentTypeFilename', fields ['document_type', 'filename']
db.delete_unique(u'documents_documenttypefilename', ['document_type_id', 'filename']) db.delete_unique(u'documents_documenttypefilename', ['document_type_id', 'filename'])
models = { models = {
u'auth.group': { u'auth.group': {
'Meta': {'object_name': 'Group'}, 'Meta': {'object_name': 'Group'},

1
mayan/apps/documents/south_migrations/0031_remove_orphan_documents.py
View File

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

1
mayan/apps/documents/views.py
View File

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

1
mayan/apps/documents/widgets.py
View File

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

10
mayan/apps/dynamic_search/tests.py
View File

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

3
mayan/apps/events/south_migrations/0001_initial.py
View File

@@ -1,5 +1,4 @@
# -*- coding: utf-8 -*- # -*- coding: utf-8 -*-
from south.utils import datetime_utils as datetime
from south.db import db from south.db import db
from south.v2 import SchemaMigration from south.v2 import SchemaMigration
from django.db import models from django.db import models
@@ -15,12 +14,10 @@ class Migration(SchemaMigration):
)) ))
db.send_create_signal(u'events', ['EventType']) db.send_create_signal(u'events', ['EventType'])
def backwards(self, orm): def backwards(self, orm):
# Deleting model 'EventType' # Deleting model 'EventType'
db.delete_table(u'events_eventtype') db.delete_table(u'events_eventtype')
models = { models = {
u'events.eventtype': { u'events.eventtype': {
'Meta': {'object_name': 'EventType'}, 'Meta': {'object_name': 'EventType'},

1
mayan/apps/events/south_migrations/0002_migrate_history_data.py
View File

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

1
mayan/apps/folders/south_migrations/0004_m2m_fields.py
View File

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

1
mayan/apps/folders/south_migrations/0006_auto__chg_field_folder_datetime_created.py
View File

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

1
mayan/apps/history/__init__.py
View File

@@ -1 +0,0 @@

3
mayan/apps/history/south_migrations/0001_initial.py
View File

@@ -1,5 +1,4 @@
# -*- coding: utf-8 -*- # -*- coding: utf-8 -*-
from south.utils import datetime_utils as datetime
from south.db import db from south.db import db
from south.v2 import SchemaMigration from south.v2 import SchemaMigration
from django.db import models from django.db import models
@@ -30,7 +29,6 @@ class Migration(SchemaMigration):
)) ))
db.send_create_signal(u'history', ['History']) db.send_create_signal(u'history', ['History'])
def backwards(self, orm): def backwards(self, orm):
# Removing unique constraint on 'HistoryType', fields ['namespace', 'name'] # Removing unique constraint on 'HistoryType', fields ['namespace', 'name']
db.delete_unique(u'history_historytype', ['namespace', 'name']) db.delete_unique(u'history_historytype', ['namespace', 'name'])
@@ -41,7 +39,6 @@ class Migration(SchemaMigration):
# Deleting model 'History' # Deleting model 'History'
db.delete_table(u'history_history') db.delete_table(u'history_history')
models = { models = {
u'contenttypes.contenttype': { u'contenttypes.contenttype': {
'Meta': {'ordering': "('name',)", 'unique_together': "(('app_label', 'model'),)", 'object_name': 'ContentType', 'db_table': "'django_content_type'"}, 'Meta': {'ordering': "('name',)", 'unique_together': "(('app_label', 'model'),)", 'object_name': 'ContentType', 'db_table': "'django_content_type'"},

1
mayan/apps/history/south_migrations/0002_auto__chg_field_history_datetime.py
View File

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

7
mayan/apps/history/south_migrations/0003_auto__del_history__del_historytype__del_unique_historytype_namespace_n.py
View File

@@ -1,5 +1,4 @@
# -*- coding: utf-8 -*- # -*- coding: utf-8 -*-
from south.utils import datetime_utils as datetime
from south.db import db from south.db import db
from south.v2 import SchemaMigration from south.v2 import SchemaMigration
from django.db import models from django.db import models
@@ -20,7 +19,6 @@ class Migration(SchemaMigration):
# Deleting model 'HistoryType' # Deleting model 'HistoryType'
db.delete_table(u'history_historytype') db.delete_table(u'history_historytype')
def backwards(self, orm): def backwards(self, orm):
# Adding model 'History' # Adding model 'History'
db.create_table(u'history_history', ( db.create_table(u'history_history', (
@@ -44,9 +42,6 @@ class Migration(SchemaMigration):
# Adding unique constraint on 'HistoryType', fields ['namespace', 'name'] # Adding unique constraint on 'HistoryType', fields ['namespace', 'name']
db.create_unique(u'history_historytype', ['namespace', 'name']) db.create_unique(u'history_historytype', ['namespace', 'name'])
models = {}
models = {
}
complete_apps = ['history'] complete_apps = ['history']

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

@@ -64,7 +64,8 @@ def smart_link_instances_for_document(request, document_id):
queryset = SmartLink.objects.get_for(document) queryset = SmartLink.objects.get_for(document)
except Exception as exception: except Exception as exception:
queryset = [] 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} {'document': document, 'exception': exception}
) )

1
mayan/apps/lock_manager/south_migrations/0001_initial.py
View File

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

1
mayan/apps/lock_manager/south_migrations/0002_auto__chg_field_lock_creation_datetime.py
View File

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

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

@@ -1,8 +1,6 @@
from __future__ import absolute_import, unicode_literals from __future__ import absolute_import, unicode_literals
from django.core.exceptions import PermissionDenied 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.shortcuts import render_to_response
from django.template import RequestContext from django.template import RequestContext
from django.utils.translation import ugettext_lazy as _ from django.utils.translation import ugettext_lazy as _

8
mayan/apps/metadata/api_views.py
View File

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

3
mayan/apps/metadata/south_migrations/0004_auto__del_metadataset__del_metadatasetitem__chg_field_documentmetadata.py
View File

@@ -1,5 +1,4 @@
# -*- coding: utf-8 -*- # -*- coding: utf-8 -*-
from south.utils import datetime_utils as datetime
from south.db import db from south.db import db
from south.v2 import SchemaMigration from south.v2 import SchemaMigration
from django.db import models from django.db import models
@@ -17,7 +16,6 @@ class Migration(SchemaMigration):
# Removing M2M table for field default_metadata_sets on 'DocumentTypeDefaults' # Removing M2M table for field default_metadata_sets on 'DocumentTypeDefaults'
db.delete_table(db.shorten_name(u'metadata_documenttypedefaults_default_metadata_sets')) db.delete_table(db.shorten_name(u'metadata_documenttypedefaults_default_metadata_sets'))
# Changing field 'DocumentMetadata.value' # Changing field 'DocumentMetadata.value'
db.alter_column(u'metadata_documentmetadata', 'value', self.gf('django.db.models.fields.CharField')(max_length=255)) 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']) db.create_unique(m2m_table_name, ['documenttypedefaults_id', 'metadataset_id'])
# Changing field 'DocumentMetadata.value' # Changing field 'DocumentMetadata.value'
db.alter_column(u'metadata_documentmetadata', 'value', self.gf('django.db.models.fields.CharField')(max_length=256)) db.alter_column(u'metadata_documentmetadata', 'value', self.gf('django.db.models.fields.CharField')(max_length=256))

1
mayan/apps/metadata/south_migrations/0005_auto__chg_field_documentmetadata_value.py
View File

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

3
mayan/apps/metadata/south_migrations/0006_auto__add_documenttypemetadatatypeoptions.py
View File

@@ -1,5 +1,4 @@
# -*- coding: utf-8 -*- # -*- coding: utf-8 -*-
from south.utils import datetime_utils as datetime
from south.db import db from south.db import db
from south.v2 import SchemaMigration from south.v2 import SchemaMigration
from django.db import models from django.db import models
@@ -20,7 +19,6 @@ class Migration(SchemaMigration):
# Removing M2M table for field default_metadata on 'DocumentTypeDefaults' # Removing M2M table for field default_metadata on 'DocumentTypeDefaults'
db.delete_table(db.shorten_name(u'metadata_documenttypedefaults_default_metadata')) db.delete_table(db.shorten_name(u'metadata_documenttypedefaults_default_metadata'))
def backwards(self, orm): def backwards(self, orm):
# Deleting model 'DocumentTypeMetadataTypeOptions' # Deleting model 'DocumentTypeMetadataTypeOptions'
db.delete_table(u'metadata_documenttypemetadatatypeoptions') db.delete_table(u'metadata_documenttypemetadatatypeoptions')
@@ -34,7 +32,6 @@ class Migration(SchemaMigration):
)) ))
db.create_unique(m2m_table_name, ['documenttypedefaults_id', 'metadatatype_id']) db.create_unique(m2m_table_name, ['documenttypedefaults_id', 'metadatatype_id'])
models = { models = {
u'documents.document': { u'documents.document': {
'Meta': {'ordering': "['-date_added']", 'object_name': 'Document'}, 'Meta': {'ordering': "['-date_added']", 'object_name': 'Document'},

3
mayan/apps/metadata/south_migrations/0007_auto__del_documenttypedefaults__del_documenttypemetadatatypeoptions__a.py
View File

@@ -1,5 +1,4 @@
# -*- coding: utf-8 -*- # -*- coding: utf-8 -*-
from south.utils import datetime_utils as datetime
from south.db import db from south.db import db
from south.v2 import SchemaMigration from south.v2 import SchemaMigration
from django.db import models from django.db import models
@@ -23,7 +22,6 @@ class Migration(SchemaMigration):
)) ))
db.send_create_signal(u'metadata', ['DocumentTypeMetadataType']) db.send_create_signal(u'metadata', ['DocumentTypeMetadataType'])
def backwards(self, orm): def backwards(self, orm):
# Adding model 'DocumentTypeDefaults' # Adding model 'DocumentTypeDefaults'
db.create_table(u'metadata_documenttypedefaults', ( db.create_table(u'metadata_documenttypedefaults', (
@@ -44,7 +42,6 @@ class Migration(SchemaMigration):
# Deleting model 'DocumentTypeMetadataType' # Deleting model 'DocumentTypeMetadataType'
db.delete_table(u'metadata_documenttypemetadatatype') db.delete_table(u'metadata_documenttypemetadatatype')
models = { models = {
u'documents.document': { u'documents.document': {
'Meta': {'ordering': "['-date_added']", 'object_name': 'Document'}, 'Meta': {'ordering': "['-date_added']", 'object_name': 'Document'},

3
mayan/apps/metadata/south_migrations/0008_auto__add_unique_documenttypemetadatatype_document_type_metadata_type.py
View File

@@ -1,5 +1,4 @@
# -*- coding: utf-8 -*- # -*- coding: utf-8 -*-
from south.utils import datetime_utils as datetime
from south.db import db from south.db import db
from south.v2 import SchemaMigration from south.v2 import SchemaMigration
from django.db import models from django.db import models
@@ -11,12 +10,10 @@ class Migration(SchemaMigration):
# Adding unique constraint on 'DocumentTypeMetadataType', fields ['document_type', 'metadata_type'] # Adding unique constraint on 'DocumentTypeMetadataType', fields ['document_type', 'metadata_type']
db.create_unique(u'metadata_documenttypemetadatatype', ['document_type_id', 'metadata_type_id']) db.create_unique(u'metadata_documenttypemetadatatype', ['document_type_id', 'metadata_type_id'])
def backwards(self, orm): def backwards(self, orm):
# Removing unique constraint on 'DocumentTypeMetadataType', fields ['document_type', 'metadata_type'] # Removing unique constraint on 'DocumentTypeMetadataType', fields ['document_type', 'metadata_type']
db.delete_unique(u'metadata_documenttypemetadatatype', ['document_type_id', 'metadata_type_id']) db.delete_unique(u'metadata_documenttypemetadatatype', ['document_type_id', 'metadata_type_id'])
models = { models = {
u'documents.document': { u'documents.document': {
'Meta': {'ordering': "['-date_added']", 'object_name': 'Document'}, 'Meta': {'ordering': "['-date_added']", 'object_name': 'Document'},

1
mayan/apps/metadata/south_migrations/0009_auto__chg_field_metadatatype_title.py
View File

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

3
mayan/apps/metadata/south_migrations/0010_auto__add_unique_documentmetadata_document_metadata_type.py
View File

@@ -1,5 +1,4 @@
# -*- coding: utf-8 -*- # -*- coding: utf-8 -*-
from south.utils import datetime_utils as datetime
from south.db import db from south.db import db
from south.v2 import SchemaMigration from south.v2 import SchemaMigration
from django.db import models from django.db import models
@@ -11,12 +10,10 @@ class Migration(SchemaMigration):
# Adding unique constraint on 'DocumentMetadata', fields ['document', 'metadata_type'] # Adding unique constraint on 'DocumentMetadata', fields ['document', 'metadata_type']
db.create_unique(u'metadata_documentmetadata', ['document_id', 'metadata_type_id']) db.create_unique(u'metadata_documentmetadata', ['document_id', 'metadata_type_id'])
def backwards(self, orm): def backwards(self, orm):
# Removing unique constraint on 'DocumentMetadata', fields ['document', 'metadata_type'] # Removing unique constraint on 'DocumentMetadata', fields ['document', 'metadata_type']
db.delete_unique(u'metadata_documentmetadata', ['document_id', 'metadata_type_id']) db.delete_unique(u'metadata_documentmetadata', ['document_id', 'metadata_type_id'])
models = { models = {
u'documents.document': { u'documents.document': {
'Meta': {'ordering': "['-date_added']", 'object_name': 'Document'}, 'Meta': {'ordering': "['-date_added']", 'object_name': 'Document'},

3
mayan/apps/metadata/south_migrations/0011_auto__add_field_metadatatype_validation.py
View File

@@ -1,5 +1,4 @@
# -*- coding: utf-8 -*- # -*- coding: utf-8 -*-
from south.utils import datetime_utils as datetime
from south.db import db from south.db import db
from south.v2 import SchemaMigration from south.v2 import SchemaMigration
from django.db import models from django.db import models
@@ -13,12 +12,10 @@ class Migration(SchemaMigration):
self.gf('django.db.models.fields.CharField')(default='', max_length=64), self.gf('django.db.models.fields.CharField')(default='', max_length=64),
keep_default=False) keep_default=False)
def backwards(self, orm): def backwards(self, orm):
# Deleting field 'MetadataType.validation' # Deleting field 'MetadataType.validation'
db.delete_column(u'metadata_metadatatype', 'validation') db.delete_column(u'metadata_metadatatype', 'validation')
models = { models = {
u'documents.document': { u'documents.document': {
'Meta': {'ordering': "['-date_added']", 'object_name': 'Document'}, 'Meta': {'ordering': "['-date_added']", 'object_name': 'Document'},

1
mayan/apps/metadata/tasks.py
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(): for document in DocumentType.objects.get(pk=document_type_id).documents.all():
document.metadata.create(metadata_type=metadata_type) document.metadata.create(metadata_type=metadata_type)

12
mayan/apps/metadata/views.py
View File

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

1
mayan/apps/ocr/south_migrations/0003_auto__chg_field_queuedocument_node_name__chg_field_queuedocument_datet.py
View File

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

3
mayan/apps/ocr/south_migrations/0004_auto__del_documentqueue__del_queuedocument__add_documentversionocrerro.py
View File

@@ -1,5 +1,4 @@
# -*- coding: utf-8 -*- # -*- coding: utf-8 -*-
from south.utils import datetime_utils as datetime
from south.db import db from south.db import db
from south.v2 import SchemaMigration from south.v2 import SchemaMigration
from django.db import models from django.db import models
@@ -23,7 +22,6 @@ class Migration(SchemaMigration):
)) ))
db.send_create_signal(u'ocr', ['DocumentVersionOCRError']) db.send_create_signal(u'ocr', ['DocumentVersionOCRError'])
def backwards(self, orm): def backwards(self, orm):
# Adding model 'DocumentQueue' # Adding model 'DocumentQueue'
db.create_table(u'ocr_documentqueue', ( db.create_table(u'ocr_documentqueue', (
@@ -47,7 +45,6 @@ class Migration(SchemaMigration):
# Deleting model 'DocumentVersionOCRError' # Deleting model 'DocumentVersionOCRError'
db.delete_table(u'ocr_documentversionocrerror') db.delete_table(u'ocr_documentversionocrerror')
models = { models = {
u'documents.document': { u'documents.document': {
'Meta': {'ordering': "['-date_added']", 'object_name': 'Document'}, 'Meta': {'ordering': "['-date_added']", 'object_name': 'Document'},

8
mayan/apps/permissions/api_views.py
View File

@@ -1,13 +1,15 @@
from __future__ import unicode_literals 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.filters import MayanObjectPermissionsFilter
from rest_api.permissions import MayanPermission from rest_api.permissions import MayanPermission
from .models import Role from .models import Role
from .permissions import (PERMISSION_ROLE_CREATE, PERMISSION_ROLE_DELETE, from .permissions import (
PERMISSION_ROLE_EDIT, PERMISSION_ROLE_VIEW) PERMISSION_ROLE_CREATE, PERMISSION_ROLE_DELETE, PERMISSION_ROLE_EDIT,
PERMISSION_ROLE_VIEW
)
from .serializers import RoleSerializer from .serializers import RoleSerializer

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

@@ -106,7 +106,6 @@ def role_permissions(request, role_id):
def permission_grant(request): def permission_grant(request):
Permission.objects.check_permissions(request.user, [PERMISSION_PERMISSION_GRANT]) Permission.objects.check_permissions(request.user, [PERMISSION_PERMISSION_GRANT])
items_property_list = loads(request.GET.get('items_property_list', [])) 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)))) 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)))) 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): def permission_revoke(request):
Permission.objects.check_permissions(request.user, [PERMISSION_PERMISSION_REVOKE]) Permission.objects.check_permissions(request.user, [PERMISSION_PERMISSION_REVOKE])
items_property_list = loads(request.GET.get('items_property_list', [])) 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))) 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))) previous = request.POST.get('previous', request.GET.get('previous', request.META.get('HTTP_REFERER', None)))

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

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

3
mayan/apps/sources/south_migrations/0005_auto__add_imapemail__add_intervalbasemodel__add_pop3email__add_emailba.py
View File

@@ -1,5 +1,4 @@
# -*- coding: utf-8 -*- # -*- coding: utf-8 -*-
from south.utils import datetime_utils as datetime
from south.db import db from south.db import db
from south.v2 import SchemaMigration from south.v2 import SchemaMigration
from django.db import models from django.db import models
@@ -42,7 +41,6 @@ class Migration(SchemaMigration):
)) ))
db.send_create_signal(u'sources', ['EmailBaseModel']) db.send_create_signal(u'sources', ['EmailBaseModel'])
def backwards(self, orm): def backwards(self, orm):
# Deleting model 'IMAPEmail' # Deleting model 'IMAPEmail'
db.delete_table(u'sources_imapemail') db.delete_table(u'sources_imapemail')
@@ -56,7 +54,6 @@ class Migration(SchemaMigration):
# Deleting model 'EmailBaseModel' # Deleting model 'EmailBaseModel'
db.delete_table(u'sources_emailbasemodel') db.delete_table(u'sources_emailbasemodel')
models = { models = {
u'contenttypes.contenttype': { u'contenttypes.contenttype': {
'Meta': {'ordering': "('name',)", 'unique_together': "(('app_label', 'model'),)", 'object_name': 'ContentType', 'db_table': "'django_content_type'"}, 'Meta': {'ordering': "('name',)", 'unique_together': "(('app_label', 'model'),)", 'object_name': 'ContentType', 'db_table': "'django_content_type'"},

1
mayan/apps/sources/south_migrations/0006_auto__del_field_source_whitelist__del_field_source_blacklist.py
View File

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

1
mayan/apps/sources/south_migrations/0008_auto__chg_field_intervalbasemodel_document_type.py
View File

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

1
mayan/apps/sources/south_migrations/0011_auto__del_field_intervalbasemodel_document_type.py
View File

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

1
mayan/apps/sources/south_migrations/0012_auto__add_field_intervalbasemodel_document_type.py
View File

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

1
mayan/apps/sources/south_migrations/0013_auto__del_field_watchfoldersource_delete_after_upload.py
View File

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

15
mayan/apps/sources/tests.py
View File

@@ -1,10 +1,6 @@
from __future__ import unicode_literals from __future__ import unicode_literals
from json import loads
from django.conf import settings
from django.contrib.auth.models import User from django.contrib.auth.models import User
from django.core.files.base import File
from django.core.urlresolvers import reverse from django.core.urlresolvers import reverse
from django.test.client import Client from django.test.client import Client
from django.test import TestCase 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.literals import SOURCE_CHOICE_WEB_FORM
from sources.models import WebFormSource from sources.models import WebFormSource
from documents.tests import (TEST_ADMIN_PASSWORD, TEST_ADMIN_USERNAME, from documents.tests import (
TEST_ADMIN_EMAIL, TEST_SMALL_DOCUMENT_FILENAME, TEST_ADMIN_PASSWORD, TEST_ADMIN_USERNAME, TEST_ADMIN_EMAIL,
TEST_DOCUMENT_PATH, TEST_SIGNED_DOCUMENT_PATH, TEST_SMALL_DOCUMENT_FILENAME, TEST_DOCUMENT_PATH,
TEST_SMALL_DOCUMENT_PATH, TEST_SIGNED_DOCUMENT_PATH, TEST_SMALL_DOCUMENT_PATH,
TEST_DOCUMENT_DESCRIPTION, TEST_DOCUMENT_TYPE) TEST_DOCUMENT_DESCRIPTION, TEST_DOCUMENT_TYPE
)
class UploadDocumentTestCase(TestCase): class UploadDocumentTestCase(TestCase):

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

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

1
mayan/apps/tags/views.py
View File

@@ -32,7 +32,6 @@ logger = logging.getLogger(__name__)
def tag_create(request): def tag_create(request):
Permission.objects.check_permissions(request.user, [PERMISSION_TAG_CREATE]) Permission.objects.check_permissions(request.user, [PERMISSION_TAG_CREATE])
redirect_url = reverse('tags:tag_list') 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': if request.method == 'POST':
form = TagForm(request.POST) form = TagForm(request.POST)

4
mayan/apps/user_management/__init__.py
View File

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