diff --git a/notifications/migrations/0002_auto_20150224_1134.py b/notifications/migrations/0002_auto_20150224_1134.py new file mode 100644 index 0000000..5e34689 --- /dev/null +++ b/notifications/migrations/0002_auto_20150224_1134.py @@ -0,0 +1,26 @@ +# -*- coding: utf-8 -*- +from __future__ import unicode_literals + +from django.db import models, migrations + + +class Migration(migrations.Migration): + + dependencies = [ + ('notifications', '0001_initial'), + ] + + operations = [ + migrations.AddField( + model_name='notification', + name='deleted', + field=models.BooleanField(default=False), + preserve_default=True, + ), + migrations.AddField( + model_name='notification', + name='emailed', + field=models.BooleanField(default=False), + preserve_default=True, + ), + ] diff --git a/notifications/models.py b/notifications/models.py index 9d19416..2e9d2d2 100644 --- a/notifications/models.py +++ b/notifications/models.py @@ -112,6 +112,8 @@ class Notification(models.Model): timestamp = models.DateTimeField(default=now) public = models.BooleanField(default=True) + deleted = models.BooleanField(default=False) + emailed = models.BooleanField(default=False) objects = managers.PassThroughManager.for_queryset_class(NotificationQuerySet)() diff --git a/notifications/south_migrations/0007_auto__del_field_notification_data__add_field_notification_deleted__add.py b/notifications/south_migrations/0007_auto__del_field_notification_data__add_field_notification_deleted__add.py new file mode 100644 index 0000000..072407e --- /dev/null +++ b/notifications/south_migrations/0007_auto__del_field_notification_data__add_field_notification_deleted__add.py @@ -0,0 +1,96 @@ +# -*- 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 field 'Notification.data' + db.delete_column(u'notifications_notification', 'data') + + # Adding field 'Notification.deleted' + db.add_column(u'notifications_notification', 'deleted', + self.gf('django.db.models.fields.BooleanField')(default=False), + keep_default=False) + + # Adding field 'Notification.emailed' + db.add_column(u'notifications_notification', 'emailed', + self.gf('django.db.models.fields.BooleanField')(default=False), + keep_default=False) + + + def backwards(self, orm): + # Adding field 'Notification.data' + db.add_column(u'notifications_notification', 'data', + self.gf('django.db.models.fields.TextField')(null=True, blank=True), + keep_default=False) + + # Deleting field 'Notification.deleted' + db.delete_column(u'notifications_notification', 'deleted') + + # Deleting field 'Notification.emailed' + db.delete_column(u'notifications_notification', 'emailed') + + + 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'notifications.notification': { + 'Meta': {'ordering': "('-timestamp',)", 'object_name': 'Notification'}, + 'action_object_content_type': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'notify_action_object'", 'null': 'True', 'to': u"orm['contenttypes.ContentType']"}), + 'action_object_object_id': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}), + 'actor_content_type': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'notify_actor'", 'to': u"orm['contenttypes.ContentType']"}), + 'actor_object_id': ('django.db.models.fields.CharField', [], {'max_length': '255'}), + 'deleted': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), + 'description': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'emailed': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'level': ('django.db.models.fields.CharField', [], {'default': "'info'", 'max_length': '20'}), + 'public': ('django.db.models.fields.BooleanField', [], {'default': 'True'}), + 'recipient': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'notifications'", 'to': u"orm['auth.User']"}), + 'target_content_type': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'notify_target'", 'null': 'True', 'to': u"orm['contenttypes.ContentType']"}), + 'target_object_id': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}), + 'timestamp': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}), + 'unread': ('django.db.models.fields.BooleanField', [], {'default': 'True'}), + 'verb': ('django.db.models.fields.CharField', [], {'max_length': '255'}) + } + } + + complete_apps = ['notifications'] \ No newline at end of file diff --git a/notifications/views.py b/notifications/views.py index f9fbb2e..1fa97eb 100644 --- a/notifications/views.py +++ b/notifications/views.py @@ -82,7 +82,8 @@ def delete(request, slug=None): id = slug2id(slug) notification = get_object_or_404(Notification, recipient=request.user, id=id) - notification.delete() + notification.deleted = True + notification.save() next = request.REQUEST.get('next')