From f594b9c2707cb22959699ee3973b5ddf689ca9f8 Mon Sep 17 00:00:00 2001 From: Roberto Rosario Date: Sat, 18 Oct 2014 00:37:04 -0400 Subject: [PATCH] Remove the FolderDocuments model simplyfing the Folder model and related views --- mayan/apps/folders/__init__.py | 2 +- mayan/apps/folders/admin.py | 16 +--- mayan/apps/folders/migrations/0003_auto.py | 92 +++++++++++++++++++ .../folders/migrations/0004_m2m_fields.py | 89 ++++++++++++++++++ .../0005_auto__del_folderdocument.py | 85 +++++++++++++++++ mayan/apps/folders/models.py | 26 +----- mayan/apps/folders/views.py | 7 +- 7 files changed, 274 insertions(+), 43 deletions(-) create mode 100644 mayan/apps/folders/migrations/0003_auto.py create mode 100644 mayan/apps/folders/migrations/0004_m2m_fields.py create mode 100644 mayan/apps/folders/migrations/0005_auto__del_folderdocument.py diff --git a/mayan/apps/folders/__init__.py b/mayan/apps/folders/__init__.py index 95418be332..0304ef675e 100644 --- a/mayan/apps/folders/__init__.py +++ b/mayan/apps/folders/__init__.py @@ -24,7 +24,7 @@ from .urls import api_urls def document_folders(self): - return Folder.objects.filter(folderdocument__document=self) + return Folder.objects.filter(documents=self) register_links(Document, [document_folder_list], menu_name='form_header') diff --git a/mayan/apps/folders/admin.py b/mayan/apps/folders/admin.py index f558ec7922..e5389bc895 100644 --- a/mayan/apps/folders/admin.py +++ b/mayan/apps/folders/admin.py @@ -2,18 +2,6 @@ from __future__ import absolute_import from django.contrib import admin -from .models import Folder, FolderDocument +from .models import Folder - -class FolderDocumentInline(admin.StackedInline): - model = FolderDocument - extra = 1 - classes = ('collapse-open',) - allow_add = True - - -class FolderAdmin(admin.ModelAdmin): - inlines = [FolderDocumentInline] - - -admin.site.register(Folder, FolderAdmin) +admin.site.register(Folder) diff --git a/mayan/apps/folders/migrations/0003_auto.py b/mayan/apps/folders/migrations/0003_auto.py new file mode 100644 index 0000000000..843ff683e1 --- /dev/null +++ b/mayan/apps/folders/migrations/0003_auto.py @@ -0,0 +1,92 @@ +# -*- 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 + + +class Migration(SchemaMigration): + + def forwards(self, orm): + # Adding M2M table for field documents on 'Folder' + m2m_table_name = db.shorten_name(u'folders_folder_documents') + db.create_table(m2m_table_name, ( + ('id', models.AutoField(verbose_name='ID', primary_key=True, auto_created=True)), + ('folder', models.ForeignKey(orm[u'folders.folder'], null=False)), + ('document', models.ForeignKey(orm[u'documents.document'], null=False)) + )) + db.create_unique(m2m_table_name, ['folder_id', 'document_id']) + + + def backwards(self, orm): + # Removing M2M table for field documents on 'Folder' + db.delete_table(db.shorten_name(u'folders_folder_documents')) + + + models = { + u'auth.group': { + 'Meta': {'object_name': 'Group'}, + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '80'}), + 'permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': u"orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}) + }, + u'auth.permission': { + 'Meta': {'ordering': "(u'content_type__app_label', u'content_type__model', u'codename')", 'unique_together': "((u'content_type', u'codename'),)", 'object_name': 'Permission'}, + 'codename': ('django.db.models.fields.CharField', [], {'max_length': '100'}), + 'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['contenttypes.ContentType']"}), + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '50'}) + }, + u'auth.user': { + 'Meta': {'object_name': 'User'}, + 'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}), + 'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'blank': 'True'}), + 'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}), + 'groups': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'related_name': "u'user_set'", 'blank': 'True', 'to': u"orm['auth.Group']"}), + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'is_active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}), + 'is_staff': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), + 'is_superuser': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), + 'last_login': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}), + 'last_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}), + 'password': ('django.db.models.fields.CharField', [], {'max_length': '128'}), + 'user_permissions': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'related_name': "u'user_set'", 'blank': 'True', 'to': u"orm['auth.Permission']"}), + 'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'}) + }, + u'contenttypes.contenttype': { + 'Meta': {'ordering': "('name',)", 'unique_together': "(('app_label', 'model'),)", 'object_name': 'ContentType', 'db_table': "'django_content_type'"}, + 'app_label': ('django.db.models.fields.CharField', [], {'max_length': '100'}), + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'model': ('django.db.models.fields.CharField', [], {'max_length': '100'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '100'}) + }, + u'documents.document': { + 'Meta': {'ordering': "['-date_added']", 'object_name': 'Document'}, + 'date_added': ('django.db.models.fields.DateTimeField', [], {'db_index': 'True'}), + 'description': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'document_type': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'documents'", 'null': 'True', 'to': u"orm['documents.DocumentType']"}), + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'uuid': ('django.db.models.fields.CharField', [], {'max_length': '48', 'blank': 'True'}) + }, + u'documents.documenttype': { + 'Meta': {'ordering': "['name']", 'object_name': 'DocumentType'}, + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '32'}) + }, + u'folders.folder': { + 'Meta': {'ordering': "('title',)", 'unique_together': "(('title', 'user'),)", 'object_name': 'Folder'}, + 'datetime_created': ('django.db.models.fields.DateTimeField', [], {}), + 'documents': ('django.db.models.fields.related.ManyToManyField', [], {'to': u"orm['documents.Document']", 'symmetrical': 'False'}), + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'title': ('django.db.models.fields.CharField', [], {'max_length': '128', 'db_index': 'True'}), + 'user': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['auth.User']"}) + }, + u'folders.folderdocument': { + 'Meta': {'object_name': 'FolderDocument'}, + 'document': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['documents.Document']"}), + 'folder': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['folders.Folder']"}), + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}) + } + } + + complete_apps = ['folders'] \ No newline at end of file diff --git a/mayan/apps/folders/migrations/0004_m2m_fields.py b/mayan/apps/folders/migrations/0004_m2m_fields.py new file mode 100644 index 0000000000..65c9617f9a --- /dev/null +++ b/mayan/apps/folders/migrations/0004_m2m_fields.py @@ -0,0 +1,89 @@ +# -*- 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 + + +class Migration(DataMigration): + + def forwards(self, orm): + "Write your forwards methods here." + # Note: Don't use "from appname.models import ModelName". + # Use orm.ModelName to refer to models in this application, + # and orm['appname.ModelName'] for models in other applications. + for folder in orm.Folder.objects.all(): + for folder_document in orm.FolderDocument.objects.filter(folder=folder): + folder.documents.add(folder_document.document) + + def backwards(self, orm): + "Write your backwards methods here." + + models = { + u'auth.group': { + 'Meta': {'object_name': 'Group'}, + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '80'}), + 'permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': u"orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}) + }, + u'auth.permission': { + 'Meta': {'ordering': "(u'content_type__app_label', u'content_type__model', u'codename')", 'unique_together': "((u'content_type', u'codename'),)", 'object_name': 'Permission'}, + 'codename': ('django.db.models.fields.CharField', [], {'max_length': '100'}), + 'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['contenttypes.ContentType']"}), + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '50'}) + }, + u'auth.user': { + 'Meta': {'object_name': 'User'}, + 'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}), + 'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'blank': 'True'}), + 'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}), + 'groups': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'related_name': "u'user_set'", 'blank': 'True', 'to': u"orm['auth.Group']"}), + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'is_active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}), + 'is_staff': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), + 'is_superuser': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), + 'last_login': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}), + 'last_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}), + 'password': ('django.db.models.fields.CharField', [], {'max_length': '128'}), + 'user_permissions': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'related_name': "u'user_set'", 'blank': 'True', 'to': u"orm['auth.Permission']"}), + 'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'}) + }, + u'contenttypes.contenttype': { + 'Meta': {'ordering': "('name',)", 'unique_together': "(('app_label', 'model'),)", 'object_name': 'ContentType', 'db_table': "'django_content_type'"}, + 'app_label': ('django.db.models.fields.CharField', [], {'max_length': '100'}), + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'model': ('django.db.models.fields.CharField', [], {'max_length': '100'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '100'}) + }, + u'documents.document': { + 'Meta': {'ordering': "['-date_added']", 'object_name': 'Document'}, + 'date_added': ('django.db.models.fields.DateTimeField', [], {'db_index': 'True'}), + 'description': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'document_type': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'documents'", 'null': 'True', 'to': u"orm['documents.DocumentType']"}), + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'uuid': ('django.db.models.fields.CharField', [], {'max_length': '48', 'blank': 'True'}) + }, + u'documents.documenttype': { + 'Meta': {'ordering': "['name']", 'object_name': 'DocumentType'}, + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '32'}) + }, + u'folders.folder': { + 'Meta': {'ordering': "('title',)", 'unique_together': "(('title', 'user'),)", 'object_name': 'Folder'}, + 'datetime_created': ('django.db.models.fields.DateTimeField', [], {}), + 'documents': ('django.db.models.fields.related.ManyToManyField', [], {'to': u"orm['documents.Document']", 'symmetrical': 'False'}), + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'title': ('django.db.models.fields.CharField', [], {'max_length': '128', 'db_index': 'True'}), + 'user': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['auth.User']"}) + }, + u'folders.folderdocument': { + 'Meta': {'object_name': 'FolderDocument'}, + 'document': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['documents.Document']"}), + 'folder': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['folders.Folder']"}), + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}) + } + } + + complete_apps = ['folders'] + symmetrical = True diff --git a/mayan/apps/folders/migrations/0005_auto__del_folderdocument.py b/mayan/apps/folders/migrations/0005_auto__del_folderdocument.py new file mode 100644 index 0000000000..28f51df875 --- /dev/null +++ b/mayan/apps/folders/migrations/0005_auto__del_folderdocument.py @@ -0,0 +1,85 @@ +# -*- 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 + + +class Migration(SchemaMigration): + + def forwards(self, orm): + # Deleting model 'FolderDocument' + db.delete_table(u'folders_folderdocument') + + + def backwards(self, orm): + # Adding model 'FolderDocument' + db.create_table(u'folders_folderdocument', ( + ('folder', self.gf('django.db.models.fields.related.ForeignKey')(to=orm['folders.Folder'])), + ('document', self.gf('django.db.models.fields.related.ForeignKey')(to=orm['documents.Document'])), + (u'id', self.gf('django.db.models.fields.AutoField')(primary_key=True)), + )) + db.send_create_signal(u'folders', ['FolderDocument']) + + + models = { + u'auth.group': { + 'Meta': {'object_name': 'Group'}, + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '80'}), + 'permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': u"orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}) + }, + u'auth.permission': { + 'Meta': {'ordering': "(u'content_type__app_label', u'content_type__model', u'codename')", 'unique_together': "((u'content_type', u'codename'),)", 'object_name': 'Permission'}, + 'codename': ('django.db.models.fields.CharField', [], {'max_length': '100'}), + 'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['contenttypes.ContentType']"}), + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '50'}) + }, + u'auth.user': { + 'Meta': {'object_name': 'User'}, + 'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}), + 'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'blank': 'True'}), + 'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}), + 'groups': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'related_name': "u'user_set'", 'blank': 'True', 'to': u"orm['auth.Group']"}), + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'is_active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}), + 'is_staff': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), + 'is_superuser': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), + 'last_login': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}), + 'last_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}), + 'password': ('django.db.models.fields.CharField', [], {'max_length': '128'}), + 'user_permissions': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'related_name': "u'user_set'", 'blank': 'True', 'to': u"orm['auth.Permission']"}), + 'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'}) + }, + u'contenttypes.contenttype': { + 'Meta': {'ordering': "('name',)", 'unique_together': "(('app_label', 'model'),)", 'object_name': 'ContentType', 'db_table': "'django_content_type'"}, + 'app_label': ('django.db.models.fields.CharField', [], {'max_length': '100'}), + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'model': ('django.db.models.fields.CharField', [], {'max_length': '100'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '100'}) + }, + u'documents.document': { + 'Meta': {'ordering': "['-date_added']", 'object_name': 'Document'}, + 'date_added': ('django.db.models.fields.DateTimeField', [], {'db_index': 'True'}), + 'description': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'document_type': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'documents'", 'null': 'True', 'to': u"orm['documents.DocumentType']"}), + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'uuid': ('django.db.models.fields.CharField', [], {'max_length': '48', 'blank': 'True'}) + }, + u'documents.documenttype': { + 'Meta': {'ordering': "['name']", 'object_name': 'DocumentType'}, + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '32'}) + }, + u'folders.folder': { + 'Meta': {'ordering': "('title',)", 'unique_together': "(('title', 'user'),)", 'object_name': 'Folder'}, + 'datetime_created': ('django.db.models.fields.DateTimeField', [], {}), + 'documents': ('django.db.models.fields.related.ManyToManyField', [], {'to': u"orm['documents.Document']", 'symmetrical': 'False'}), + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'title': ('django.db.models.fields.CharField', [], {'max_length': '128', 'db_index': 'True'}), + 'user': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['auth.User']"}) + } + } + + complete_apps = ['folders'] \ No newline at end of file diff --git a/mayan/apps/folders/models.py b/mayan/apps/folders/models.py index d76daf5a8c..36cbff3736 100644 --- a/mayan/apps/folders/models.py +++ b/mayan/apps/folders/models.py @@ -4,13 +4,13 @@ from django.utils.timezone import now from django.utils.translation import ugettext as _ from documents.models import Document -# TODO: Simplify this model by adding a M2M field called documents class Folder(models.Model): title = models.CharField(max_length=128, verbose_name=_(u'Title'), db_index=True) user = models.ForeignKey(User, verbose_name=_(u'User')) datetime_created = models.DateTimeField(verbose_name=_(u'Datetime created')) + documents = models.ManyToManyField(Document, verbose_name=_('Documents')) def __unicode__(self): return self.title @@ -24,32 +24,8 @@ class Folder(models.Model): def get_absolute_url(self): return ('folders:folder_view', [self.pk]) - @property - def documents(self): - return Document.objects.filter(folderdocument__folder=self) - - def remove_document(self, document): - folder_document = self.folderdocument_set.get(document=document) - folder_document.delete() - - def add_document(self, document): - folder_document, created = FolderDocument.objects.get_or_create(folder=self, document=document) - return created - class Meta: unique_together = ('title', 'user') ordering = ('title',) verbose_name = _(u'Folder') verbose_name_plural = _(u'Folders') - - -class FolderDocument(models.Model): - folder = models.ForeignKey(Folder, verbose_name=_('Folder')) - document = models.ForeignKey(Document, verbose_name=_('Document')) - - def __unicode__(self): - return unicode(self.document) - - class Meta: - verbose_name = _(u'Folder document') - verbose_name_plural = _(u'Folders documents') diff --git a/mayan/apps/folders/views.py b/mayan/apps/folders/views.py index ec67251f76..e3eef4e07e 100644 --- a/mayan/apps/folders/views.py +++ b/mayan/apps/folders/views.py @@ -141,7 +141,7 @@ class FolderDetailView(DocumentListView): return folder def get_queryset(self): - return self.get_folder().documents + return self.get_folder().documents.all() def get_extra_context(self): return { @@ -177,7 +177,8 @@ def folder_add_document(request, document_id=None, document_id_list=None): if form.is_valid(): folder = form.cleaned_data['folder'] for document in documents: - if folder.add_document(document): + if document.pk not in folder.documents.values_list('pk', flat=True): + folder.documents.add(document) messages.success(request, _(u'Document: %(document)s added to folder: %(folder)s successfully.') % { 'document': document, 'folder': folder}) else: @@ -260,7 +261,7 @@ def folder_document_remove(request, folder_id, document_id=None, document_id_lis if request.method == 'POST': for folder_document in folder_documents: try: - folder.remove_document(folder_document) + folder.documents.remove(folder_document) messages.success(request, _(u'Document: %s removed successfully.') % folder_document) except Exception as exception: messages.error(request, _(u'Document: %(document)s delete error: %(error)s') % {