From 84f7508050698fdeb7088c3cdd5637c0d37ddf8b Mon Sep 17 00:00:00 2001 From: benjaoming Date: Sat, 19 Jul 2014 14:24:40 +0200 Subject: [PATCH] Revert "Fix #224" --- .../south_migrations/0001_initial.py | 24 +++++++++---------- .../0007_auto__add_articlesubscription.py | 24 +++++++++---------- 2 files changed, 24 insertions(+), 24 deletions(-) diff --git a/wiki/plugins/notifications/south_migrations/0001_initial.py b/wiki/plugins/notifications/south_migrations/0001_initial.py index 9c2f8b013..10a6f30db 100644 --- a/wiki/plugins/notifications/south_migrations/0001_initial.py +++ b/wiki/plugins/notifications/south_migrations/0001_initial.py @@ -13,7 +13,7 @@ User = get_user_model() user_orm_label = '%s.%s' % (User._meta.app_label, User._meta.object_name) -user_model_label = '%s.%s' % (User._meta.app_label, User._meta.module_name) +user_model_label = '%s.%s' % (User._meta.app_label, User._meta.module_name) class Migration(SchemaMigration): @@ -21,7 +21,7 @@ class Migration(SchemaMigration): def forwards(self, orm): # Adding model 'ArticleSubscription' db.create_table('notifications_articlesubscription', ( - ('subscription_ptr', self.gf('django.db.models.fields.related.OneToOneField')(to=orm['django_nyt.Subscription'], unique=True)), + ('subscription_ptr', self.gf('django.db.models.fields.related.OneToOneField')(to=orm['django_notify.Subscription'], unique=True)), ('articleplugin_ptr', self.gf('django.db.models.fields.related.OneToOneField')(to=orm['wiki.ArticlePlugin'], unique=True, primary_key=True)), )) db.send_create_signal('notifications', ['ArticleSubscription']) @@ -69,30 +69,30 @@ def backwards(self, orm): 'model': ('django.db.models.fields.CharField', [], {'max_length': '100'}), 'name': ('django.db.models.fields.CharField', [], {'max_length': '100'}) }, - 'django_nyt.notificationtype': { - 'Meta': {'object_name': 'NotificationType', 'db_table': "'nyt_notificationtype'"}, + 'django_notify.notificationtype': { + 'Meta': {'object_name': 'NotificationType', 'db_table': "'notify_notificationtype'"}, 'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['contenttypes.ContentType']", 'null': 'True', 'blank': 'True'}), 'key': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '128', 'primary_key': 'True'}), 'label': ('django.db.models.fields.CharField', [], {'max_length': '128', 'null': 'True', 'blank': 'True'}) }, - 'django_nyt.settings': { - 'Meta': {'object_name': 'Settings', 'db_table': "'nyt_settings'"}, + 'django_notify.settings': { + 'Meta': {'object_name': 'Settings', 'db_table': "'notify_settings'"}, 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), 'interval': ('django.db.models.fields.SmallIntegerField', [], {'default': '0'}), 'user': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['%s']" % user_orm_label}) }, - 'django_nyt.subscription': { - 'Meta': {'object_name': 'Subscription', 'db_table': "'nyt_subscription'"}, + 'django_notify.subscription': { + 'Meta': {'object_name': 'Subscription', 'db_table': "'notify_subscription'"}, 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'notification_type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['django_nyt.NotificationType']"}), + 'notification_type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['django_notify.NotificationType']"}), 'object_id': ('django.db.models.fields.CharField', [], {'max_length': '64', 'null': 'True', 'blank': 'True'}), 'send_emails': ('django.db.models.fields.BooleanField', [], {'default': 'True'}), - 'settings': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['django_nyt.Settings']"}) + 'settings': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['django_notify.Settings']"}) }, 'notifications.articlesubscription': { - 'Meta': {'object_name': 'ArticleSubscription', '_ormbases': ['wiki.ArticlePlugin', 'django_nyt.Subscription']}, + 'Meta': {'object_name': 'ArticleSubscription', '_ormbases': ['wiki.ArticlePlugin', 'django_notify.Subscription']}, 'articleplugin_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['wiki.ArticlePlugin']", 'unique': 'True', 'primary_key': 'True'}), - 'subscription_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['django_nyt.Subscription']", 'unique': 'True'}) + 'subscription_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['django_notify.Subscription']", 'unique': 'True'}) }, 'wiki.article': { 'Meta': {'object_name': 'Article'}, diff --git a/wiki/south_migrations/0007_auto__add_articlesubscription.py b/wiki/south_migrations/0007_auto__add_articlesubscription.py index f85b50022..b7a2183da 100644 --- a/wiki/south_migrations/0007_auto__add_articlesubscription.py +++ b/wiki/south_migrations/0007_auto__add_articlesubscription.py @@ -13,7 +13,7 @@ User = get_user_model() user_orm_label = '%s.%s' % (User._meta.app_label, User._meta.object_name) -user_model_label = '%s.%s' % (User._meta.app_label, User._meta.module_name) +user_model_label = '%s.%s' % (User._meta.app_label, User._meta.module_name) class Migration(SchemaMigration): @@ -21,7 +21,7 @@ class Migration(SchemaMigration): def forwards(self, orm): # Adding model 'ArticleSubscription' db.create_table('wiki_articlesubscription', ( - ('subscription_ptr', self.gf('django.db.models.fields.related.OneToOneField')(to=orm['django_nyt.Subscription'], unique=True)), + ('subscription_ptr', self.gf('django.db.models.fields.related.OneToOneField')(to=orm['django_notify.Subscription'], unique=True)), ('articleplugin_ptr', self.gf('django.db.models.fields.related.OneToOneField')(to=orm['wiki.ArticlePlugin'], unique=True, primary_key=True)), )) db.send_create_signal('wiki', ['ArticleSubscription']) @@ -69,25 +69,25 @@ def backwards(self, orm): 'model': ('django.db.models.fields.CharField', [], {'max_length': '100'}), 'name': ('django.db.models.fields.CharField', [], {'max_length': '100'}) }, - 'django_nyt.notificationtype': { - 'Meta': {'object_name': 'NotificationType', 'db_table': "'nyt_notificationtype'"}, + 'django_notify.notificationtype': { + 'Meta': {'object_name': 'NotificationType', 'db_table': "'notify_notificationtype'"}, 'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['contenttypes.ContentType']", 'null': 'True', 'blank': 'True'}), 'key': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '128', 'primary_key': 'True'}), 'label': ('django.db.models.fields.CharField', [], {'max_length': '128', 'null': 'True', 'blank': 'True'}) }, - 'django_nyt.settings': { - 'Meta': {'object_name': 'Settings', 'db_table': "'nyt_settings'"}, + 'django_notify.settings': { + 'Meta': {'object_name': 'Settings', 'db_table': "'notify_settings'"}, 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), 'interval': ('django.db.models.fields.SmallIntegerField', [], {'default': '0'}), 'user': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['%s']" % user_orm_label}) }, - 'django_nyt.subscription': { - 'Meta': {'object_name': 'Subscription', 'db_table': "'nyt_subscription'"}, + 'django_notify.subscription': { + 'Meta': {'object_name': 'Subscription', 'db_table': "'notify_subscription'"}, 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'notification_type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['django_nyt.NotificationType']"}), + 'notification_type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['django_notify.NotificationType']"}), 'object_id': ('django.db.models.fields.CharField', [], {'max_length': '64', 'null': 'True', 'blank': 'True'}), 'send_emails': ('django.db.models.fields.BooleanField', [], {'default': 'True'}), - 'settings': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['django_nyt.Settings']"}) + 'settings': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['django_notify.Settings']"}) }, 'sites.site': { 'Meta': {'ordering': "('domain',)", 'object_name': 'Site', 'db_table': "'django_site'"}, @@ -142,9 +142,9 @@ def backwards(self, orm): 'user_message': ('django.db.models.fields.TextField', [], {'blank': 'True'}) }, 'wiki.articlesubscription': { - 'Meta': {'object_name': 'ArticleSubscription', '_ormbases': ['wiki.ArticlePlugin', 'django_nyt.Subscription']}, + 'Meta': {'object_name': 'ArticleSubscription', '_ormbases': ['wiki.ArticlePlugin', 'django_notify.Subscription']}, 'articleplugin_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['wiki.ArticlePlugin']", 'unique': 'True', 'primary_key': 'True'}), - 'subscription_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['django_nyt.Subscription']", 'unique': 'True'}) + 'subscription_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['django_notify.Subscription']", 'unique': 'True'}) }, 'wiki.attachment': { 'Meta': {'object_name': 'Attachment', '_ormbases': ['wiki.ReusablePlugin']},