From f255c81016e3ddd7dc32b68dc9788d04e8db1d8f Mon Sep 17 00:00:00 2001 From: fergalmoran Date: Sat, 8 Jun 2013 23:18:52 +0100 Subject: [PATCH] Reverse push of a few tweaks to the migrations --- dss/settings.py | 2 +- spa/management/commands/importdownloads.py | 2 +- spa/management/commands/importplays.py | 2 +- ...ad__del_mixlike__del__activity__del_mixplay__del_mi.py | 8 ++++---- spa/migrations/0019_auto__add_activityfavourite.py | 4 ++-- spa/migrations/0020_auto__add_activityplay.py | 4 ++-- spa/migrations/0021_auto__add_activitylike.py | 4 ++-- spa/migrations/0022_auto__add_activitydownload.py | 4 ++-- 8 files changed, 15 insertions(+), 15 deletions(-) diff --git a/dss/settings.py b/dss/settings.py index c2037bd..fd3d605 100644 --- a/dss/settings.py +++ b/dss/settings.py @@ -141,7 +141,7 @@ MIDDLEWARE_CLASSES = ( 'django.middleware.clickjacking.XFrameOptionsMiddleware', 'spa.middleware.uploadify.SWFUploadMiddleware', #'spa.middleware.sqlprinter.SqlPrintingMiddleware' if DEBUG else None, - #'debug_toolbar.middleware.DebugToolbarMiddleware', + 'debug_toolbar.middleware.DebugToolbarMiddleware', ) WSGI_APPLICATION = 'dss.wsgi.application' diff --git a/spa/management/commands/importdownloads.py b/spa/management/commands/importdownloads.py index 465fb23..a7b2793 100644 --- a/spa/management/commands/importdownloads.py +++ b/spa/management/commands/importdownloads.py @@ -10,7 +10,7 @@ class Command(NoArgsCommand): def handle_noargs(self, **options): print "Importing from downloads.txt" - f = open("/home/fergalm/Dropbox/Private/deepsouthsounds.com/dss/downloads.txt", "rt") + f = open("/var/www/deepsouthsounds.com/dss/downloads.txt", "rt") rows = csv.DictReader(f, dialect='excel-tab') for row in rows: try: diff --git a/spa/management/commands/importplays.py b/spa/management/commands/importplays.py index 10866d6..3232455 100644 --- a/spa/management/commands/importplays.py +++ b/spa/management/commands/importplays.py @@ -10,7 +10,7 @@ class Command(NoArgsCommand): def handle_noargs(self, **options): print "Importing from plays.txt" - f = open("/home/fergalm/Dropbox/Private/deepsouthsounds.com/dss/plays.txt", "rt") + f = open("/var/www/deepsouthsounds.com/dss/plays.txt", "rt") rows = csv.DictReader(f, dialect='excel-tab') for row in rows: try: diff --git a/spa/migrations/0018_auto__del_mixdownload__del_mixlike__del__activity__del_mixplay__del_mi.py b/spa/migrations/0018_auto__del_mixdownload__del_mixlike__del__activity__del_mixplay__del_mi.py index 3b7099c..98950ec 100644 --- a/spa/migrations/0018_auto__del_mixdownload__del_mixlike__del__activity__del_mixplay__del_mi.py +++ b/spa/migrations/0018_auto__del_mixdownload__del_mixlike__del__activity__del_mixplay__del_mi.py @@ -9,9 +9,9 @@ class Migration(SchemaMigration): def forwards(self, orm): # Deleting model 'MixDownload' - db.delete_table(u'spa_activity') - db.delete_table(u'spa_activitymix') - db.delete_table(u'spa_mixdownload') + #db.delete_table(u'spa_activity') + #db.delete_table(u'spa_activitymix') + #db.delete_table(u'spa_mixdownload') # Deleting model 'MixLike' db.delete_table(u'spa_mixlike') @@ -267,4 +267,4 @@ class Migration(SchemaMigration): } } - complete_apps = ['spa'] \ No newline at end of file + complete_apps = ['spa'] diff --git a/spa/migrations/0019_auto__add_activityfavourite.py b/spa/migrations/0019_auto__add_activityfavourite.py index 38a61ca..374d5c7 100644 --- a/spa/migrations/0019_auto__add_activityfavourite.py +++ b/spa/migrations/0019_auto__add_activityfavourite.py @@ -9,7 +9,7 @@ class Migration(SchemaMigration): def forwards(self, orm): # Adding model 'ActivityFavourite' - db.delete_table(u'spa_activityfavourite') + #db.delete_table(u'spa_activityfavourite') db.create_table(u'spa_activityfavourite', ( (u'activity_ptr', self.gf('django.db.models.fields.related.OneToOneField')(to=orm['spa.Activity'], unique=True, primary_key=True)), ('mix', self.gf('django.db.models.fields.related.ForeignKey')(related_name='favourites', to=orm['spa.Mix'])), @@ -205,4 +205,4 @@ class Migration(SchemaMigration): } } - complete_apps = ['spa'] \ No newline at end of file + complete_apps = ['spa'] diff --git a/spa/migrations/0020_auto__add_activityplay.py b/spa/migrations/0020_auto__add_activityplay.py index 75fba23..ff7992f 100644 --- a/spa/migrations/0020_auto__add_activityplay.py +++ b/spa/migrations/0020_auto__add_activityplay.py @@ -9,7 +9,7 @@ class Migration(SchemaMigration): def forwards(self, orm): # Adding model 'ActivityPlay' - db.delete_table(u'spa_activityplay') + #db.delete_table(u'spa_activityplay') db.create_table(u'spa_activityplay', ( (u'activity_ptr', self.gf('django.db.models.fields.related.OneToOneField')(to=orm['spa.Activity'], unique=True, primary_key=True)), ('mix', self.gf('django.db.models.fields.related.ForeignKey')(related_name='plays', to=orm['spa.Mix'])), @@ -210,4 +210,4 @@ class Migration(SchemaMigration): } } - complete_apps = ['spa'] \ No newline at end of file + complete_apps = ['spa'] diff --git a/spa/migrations/0021_auto__add_activitylike.py b/spa/migrations/0021_auto__add_activitylike.py index 12115b9..1b30b75 100644 --- a/spa/migrations/0021_auto__add_activitylike.py +++ b/spa/migrations/0021_auto__add_activitylike.py @@ -9,7 +9,7 @@ class Migration(SchemaMigration): def forwards(self, orm): # Adding model 'ActivityLike' - db.delete_table(u'spa_activitylike') + #db.delete_table(u'spa_activitylike') db.create_table(u'spa_activitylike', ( (u'activity_ptr', self.gf('django.db.models.fields.related.OneToOneField')(to=orm['spa.Activity'], unique=True, primary_key=True)), ('mix', self.gf('django.db.models.fields.related.ForeignKey')(related_name='likes', to=orm['spa.Mix'])), @@ -215,4 +215,4 @@ class Migration(SchemaMigration): } } - complete_apps = ['spa'] \ No newline at end of file + complete_apps = ['spa'] diff --git a/spa/migrations/0022_auto__add_activitydownload.py b/spa/migrations/0022_auto__add_activitydownload.py index 49a380b..eb2a373 100644 --- a/spa/migrations/0022_auto__add_activitydownload.py +++ b/spa/migrations/0022_auto__add_activitydownload.py @@ -9,7 +9,7 @@ class Migration(SchemaMigration): def forwards(self, orm): # Adding model 'ActivityDownload' - db.delete_table(u'spa_activitydownload') + #db.delete_table(u'spa_activitydownload') db.create_table(u'spa_activitydownload', ( (u'activity_ptr', self.gf('django.db.models.fields.related.OneToOneField')(to=orm['spa.Activity'], unique=True, primary_key=True)), ('mix', self.gf('django.db.models.fields.related.ForeignKey')(related_name='downloads', to=orm['spa.Mix'])), @@ -220,4 +220,4 @@ class Migration(SchemaMigration): } } - complete_apps = ['spa'] \ No newline at end of file + complete_apps = ['spa']