models: remove the Mailbox.seen field
This commit is contained in:
parent
48f32ea4db
commit
ebd64254a9
|
|
@ -134,7 +134,7 @@ class DocbowGroupAdmin(auth_admin.GroupAdmin):
|
|||
|
||||
|
||||
class MailboxAdmin(admin.ModelAdmin):
|
||||
list_display = [ 'owner', 'document', 'date', 'seen' ]
|
||||
list_display = [ 'owner', 'document', 'date' ]
|
||||
list_filter = [ 'owner', 'outbox' ]
|
||||
|
||||
def lookup_allowed(self, *args, **kwargs):
|
||||
|
|
@ -143,9 +143,9 @@ class MailboxAdmin(admin.ModelAdmin):
|
|||
|
||||
|
||||
class InboxAdmin(MailboxAdmin):
|
||||
list_display = [ 'date', 'owner', 'document', 'seen', 'deleted' ]
|
||||
fields = [ 'date', 'owner', 'document', 'seen', 'deleted' ]
|
||||
readonly_fields = [ 'date', 'owner', 'document', 'seen' ]
|
||||
list_display = [ 'date', 'owner', 'document', 'deleted' ]
|
||||
fields = [ 'date', 'owner', 'document', 'deleted' ]
|
||||
readonly_fields = [ 'date', 'owner', 'document' ]
|
||||
|
||||
def queryset(self, request):
|
||||
'''Only show input mailboxes'''
|
||||
|
|
|
|||
|
|
@ -0,0 +1,187 @@
|
|||
# -*- coding: utf-8 -*-
|
||||
import datetime
|
||||
from south.db import db
|
||||
from south.v2 import SchemaMigration
|
||||
from django.db import models
|
||||
|
||||
|
||||
class Migration(SchemaMigration):
|
||||
|
||||
def forwards(self, orm):
|
||||
# Deleting field 'Mailbox.seen'
|
||||
db.delete_column(u'docbow_mailbox', 'seen')
|
||||
|
||||
|
||||
def backwards(self, orm):
|
||||
# Adding field 'Mailbox.seen'
|
||||
db.add_column(u'docbow_mailbox', 'seen',
|
||||
self.gf('django.db.models.fields.BooleanField')(default=False),
|
||||
keep_default=False)
|
||||
|
||||
|
||||
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': {'ordering': "['username']", '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'docbow.attachedfile': {
|
||||
'Meta': {'object_name': 'AttachedFile'},
|
||||
'content': ('django.db.models.fields.files.FileField', [], {'max_length': '300'}),
|
||||
'document': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'attached_files'", 'to': u"orm['docbow.Document']"}),
|
||||
u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
|
||||
'kind': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['docbow.FileTypeAttachedFileKind']", 'null': 'True', 'blank': 'True'}),
|
||||
'name': ('django.db.models.fields.CharField', [], {'max_length': '300'})
|
||||
},
|
||||
u'docbow.automaticforwarding': {
|
||||
'Meta': {'object_name': 'AutomaticForwarding'},
|
||||
'filetypes': ('django.db.models.fields.related.ManyToManyField', [], {'related_name': "'forwarding_rules'", 'symmetrical': 'False', 'to': u"orm['docbow.FileType']"}),
|
||||
'forward_to_list': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'as_recipient_forwarding_rules'", 'null': 'True', 'symmetrical': 'False', 'to': u"orm['docbow.MailingList']"}),
|
||||
'forward_to_user': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'as_recipient_forwarding_rules'", 'null': 'True', 'symmetrical': 'False', 'to': u"orm['auth.User']"}),
|
||||
u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
|
||||
'originaly_to_user': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'as_original_recipient_forwarding_rules'", 'null': 'True', 'symmetrical': 'False', 'to': u"orm['auth.User']"})
|
||||
},
|
||||
u'docbow.content': {
|
||||
'Meta': {'ordering': "['description']", 'object_name': 'Content'},
|
||||
'description': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '128'}),
|
||||
u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'})
|
||||
},
|
||||
u'docbow.delegation': {
|
||||
'Meta': {'ordering': "['by']", 'unique_together': "(('by', 'to'),)", 'object_name': 'Delegation', 'db_table': "'auth_delegation'"},
|
||||
'by': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'delegations_to'", 'to': u"orm['auth.User']"}),
|
||||
u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
|
||||
'to': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'delegations_by'", 'to': u"orm['auth.User']"})
|
||||
},
|
||||
u'docbow.deleteddocument': {
|
||||
'Meta': {'ordering': "('-document',)", 'object_name': 'DeletedDocument'},
|
||||
'document': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['docbow.Document']"}),
|
||||
u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
|
||||
'user': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['auth.User']"})
|
||||
},
|
||||
u'docbow.deletedmailbox': {
|
||||
'Meta': {'object_name': 'DeletedMailbox'},
|
||||
'delegate': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['auth.User']"}),
|
||||
u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
|
||||
'mailbox': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['docbow.Mailbox']"})
|
||||
},
|
||||
u'docbow.docbowprofile': {
|
||||
'Meta': {'object_name': 'DocbowProfile'},
|
||||
'accept_notifications': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
|
||||
u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
|
||||
'is_guest': ('django.db.models.fields.BooleanField', [], {}),
|
||||
'mobile_phone': ('django.db.models.fields.CharField', [], {'max_length': '32', 'blank': 'True'}),
|
||||
'personal_email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'blank': 'True'}),
|
||||
'user': ('django.db.models.fields.related.OneToOneField', [], {'to': u"orm['auth.User']", 'unique': 'True'})
|
||||
},
|
||||
u'docbow.document': {
|
||||
'Meta': {'ordering': "['-date']", 'object_name': 'Document'},
|
||||
'_timestamp': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
|
||||
'comment': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
|
||||
'date': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
|
||||
'filetype': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['docbow.FileType']"}),
|
||||
u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
|
||||
'real_sender': ('django.db.models.fields.CharField', [], {'max_length': '64', 'blank': 'True'}),
|
||||
'reply_to': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'replies'", 'null': 'True', 'to': u"orm['docbow.Document']"}),
|
||||
'sender': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'documents_sent'", 'to': u"orm['auth.User']"}),
|
||||
'to_list': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'to': u"orm['docbow.MailingList']", 'null': 'True', 'blank': 'True'}),
|
||||
'to_user': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'directly_received_documents'", 'null': 'True', 'symmetrical': 'False', 'to': u"orm['auth.User']"})
|
||||
},
|
||||
u'docbow.documentforwarded': {
|
||||
'Meta': {'object_name': 'DocumentForwarded'},
|
||||
'automatic': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
|
||||
'date': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}),
|
||||
'from_document': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'document_forwarded_to'", 'to': u"orm['docbow.Document']"}),
|
||||
u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
|
||||
'to_document': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'document_forwarded_from'", 'to': u"orm['docbow.Document']"})
|
||||
},
|
||||
u'docbow.filetype': {
|
||||
'Meta': {'ordering': "['name']", 'object_name': 'FileType'},
|
||||
u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
|
||||
'is_active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
|
||||
'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '128'})
|
||||
},
|
||||
u'docbow.filetypeattachedfilekind': {
|
||||
'Meta': {'ordering': "('file_type', 'position', 'name')", 'unique_together': "(('name', 'file_type'),)", 'object_name': 'FileTypeAttachedFileKind'},
|
||||
'cardinality': ('django.db.models.fields.PositiveSmallIntegerField', [], {'default': '0'}),
|
||||
'file_type': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['docbow.FileType']"}),
|
||||
u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
|
||||
'mime_types': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
|
||||
'minimum': ('django.db.models.fields.PositiveSmallIntegerField', [], {'default': '0'}),
|
||||
'name': ('django.db.models.fields.CharField', [], {'max_length': '128'}),
|
||||
'position': ('django.db.models.fields.PositiveSmallIntegerField', [], {})
|
||||
},
|
||||
u'docbow.mailbox': {
|
||||
'Meta': {'ordering': "['-date']", 'object_name': 'Mailbox'},
|
||||
'date': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}),
|
||||
'deleted': ('django.db.models.fields.BooleanField', [], {}),
|
||||
'document': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'mailboxes'", 'to': u"orm['docbow.Document']"}),
|
||||
u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
|
||||
'outbox': ('django.db.models.fields.BooleanField', [], {'default': 'False', 'db_index': 'True'}),
|
||||
'owner': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'documents'", 'to': u"orm['auth.User']"})
|
||||
},
|
||||
u'docbow.mailinglist': {
|
||||
'Meta': {'ordering': "['name']", 'object_name': 'MailingList'},
|
||||
u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
|
||||
'is_active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
|
||||
'mailing_list_members': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'related_name': "'members_lists'", 'blank': 'True', 'to': u"orm['docbow.MailingList']"}),
|
||||
'members': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'mailing_lists'", 'null': 'True', 'symmetrical': 'False', 'to': u"orm['auth.User']"}),
|
||||
'name': ('django.db.models.fields.CharField', [], {'max_length': '128'})
|
||||
},
|
||||
u'docbow.notification': {
|
||||
'Meta': {'ordering': "('-id',)", 'object_name': 'Notification'},
|
||||
'create_dt': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}),
|
||||
'ctx': ('picklefield.fields.PickledObjectField', [], {'null': 'True', 'blank': 'True'}),
|
||||
'document': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['docbow.Document']", 'null': 'True', 'blank': 'True'}),
|
||||
'done': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
|
||||
'failure': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
|
||||
u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
|
||||
'kind': ('django.db.models.fields.CharField', [], {'default': "'new-document'", 'max_length': '32'}),
|
||||
'user': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['auth.User']", 'null': 'True', 'blank': 'True'})
|
||||
},
|
||||
u'docbow.seendocument': {
|
||||
'Meta': {'ordering': "('-document',)", 'object_name': 'SeenDocument'},
|
||||
'document': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['docbow.Document']"}),
|
||||
u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
|
||||
'user': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['auth.User']"})
|
||||
},
|
||||
u'docbow.sendinglimitation': {
|
||||
'Meta': {'object_name': 'SendingLimitation'},
|
||||
'filetypes': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'related_name': "'filetype_limitation'", 'blank': 'True', 'to': u"orm['docbow.FileType']"}),
|
||||
u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
|
||||
'lists': ('django.db.models.fields.related.ManyToManyField', [], {'related_name': "'lists_limitation'", 'symmetrical': 'False', 'to': u"orm['docbow.MailingList']"}),
|
||||
'mailing_list': ('django.db.models.fields.related.OneToOneField', [], {'to': u"orm['docbow.MailingList']", 'unique': 'True'})
|
||||
}
|
||||
}
|
||||
|
||||
complete_apps = ['docbow']
|
||||
|
|
@ -650,7 +650,6 @@ class Mailbox(Model):
|
|||
related_name='documents')
|
||||
document = ForeignKey(Document, verbose_name=('Document'),
|
||||
related_name='mailboxes')
|
||||
seen = BooleanField(verbose_name=_('Seen'), blank=True)
|
||||
deleted = BooleanField(verbose_name=_('Deleted'), blank=True)
|
||||
outbox = BooleanField(verbose_name=_('Outbox message'), blank=True,
|
||||
default=False, db_index=True)
|
||||
|
|
@ -662,21 +661,11 @@ class Mailbox(Model):
|
|||
verbose_name_plural = _('Mailboxes')
|
||||
|
||||
def __unicode__(self):
|
||||
if self.seen and self.deleted:
|
||||
return _(u'seen and deleted mailbox entry {id} of user {user}:{user.id} created on '
|
||||
u'{date} for {document}').format(id=self.id, user=self.owner,
|
||||
date=self.date,
|
||||
document=self.document)
|
||||
elif self.deleted:
|
||||
if self.deleted:
|
||||
return _(u'deleted mailbox entry {id} of user {user}:{user.id} created on '
|
||||
u'{date} for {document}').format(id=self.id, user=self.owner,
|
||||
date=self.date,
|
||||
document=self.document)
|
||||
elif self.seen:
|
||||
return _(u'seen mailbox entry {id} of user {user}:{user.id} created on '
|
||||
u'{date} for {document}').format(id=self.id, user=self.owner,
|
||||
date=self.date,
|
||||
document=self.document)
|
||||
else:
|
||||
return _(u'mailbox entry {id} of user {user}:{user.id} created on '
|
||||
u'{date} for {document}').format(id=self.id, user=self.owner,
|
||||
|
|
|
|||
Loading…
Reference in New Issue