From eab8743e153a3fe53248a6917832f8dc06c7a707 Mon Sep 17 00:00:00 2001 From: Matthew Jones Date: Tue, 12 Jan 2016 13:51:20 -0500 Subject: [PATCH] Purge Tower Settings reference from activitystream --- awx/main/migrations/0075_v300_changes.py | 15 --------------- awx/main/models/activity_stream.py | 1 - 2 files changed, 16 deletions(-) diff --git a/awx/main/migrations/0075_v300_changes.py b/awx/main/migrations/0075_v300_changes.py index db25caa1f2..1347ec58ef 100644 --- a/awx/main/migrations/0075_v300_changes.py +++ b/awx/main/migrations/0075_v300_changes.py @@ -22,24 +22,10 @@ class Migration(SchemaMigration): )) db.send_create_signal('main', ['TowerSettings']) - # Adding M2M table for field tower_settings on 'ActivityStream' - m2m_table_name = db.shorten_name(u'main_activitystream_tower_settings') - db.create_table(m2m_table_name, ( - ('id', models.AutoField(verbose_name='ID', primary_key=True, auto_created=True)), - ('activitystream', models.ForeignKey(orm['main.activitystream'], null=False)), - ('towersettings', models.ForeignKey(orm['main.towersettings'], null=False)) - )) - db.create_unique(m2m_table_name, ['activitystream_id', 'towersettings_id']) - - def backwards(self, orm): # Deleting model 'TowerSettings' db.delete_table(u'main_towersettings') - # Removing M2M table for field tower_settings on 'ActivityStream' - db.delete_table(db.shorten_name(u'main_activitystream_tower_settings')) - - models = { u'auth.group': { 'Meta': {'object_name': 'Group'}, @@ -103,7 +89,6 @@ class Migration(SchemaMigration): 'schedule': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['main.Schedule']", 'symmetrical': 'False', 'blank': 'True'}), 'team': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['main.Team']", 'symmetrical': 'False', 'blank': 'True'}), 'timestamp': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}), - 'tower_settings': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['main.TowerSettings']", 'symmetrical': 'False', 'blank': 'True'}), 'unified_job': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'related_name': "'activity_stream_as_unified_job+'", 'blank': 'True', 'to': "orm['main.UnifiedJob']"}), 'unified_job_template': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'related_name': "'activity_stream_as_unified_job_template+'", 'blank': 'True', 'to': "orm['main.UnifiedJobTemplate']"}), 'user': ('django.db.models.fields.related.ManyToManyField', [], {'to': u"orm['auth.User']", 'symmetrical': 'False', 'blank': 'True'}) diff --git a/awx/main/models/activity_stream.py b/awx/main/models/activity_stream.py index f811c36507..b695831ada 100644 --- a/awx/main/models/activity_stream.py +++ b/awx/main/models/activity_stream.py @@ -53,7 +53,6 @@ class ActivityStream(models.Model): ad_hoc_command = models.ManyToManyField("AdHocCommand", blank=True) schedule = models.ManyToManyField("Schedule", blank=True) custom_inventory_script = models.ManyToManyField("CustomInventoryScript", blank=True) - tower_settings = models.ManyToManyField("TowerSettings", blank=True) def get_absolute_url(self): return reverse('api:activity_stream_detail', args=(self.pk,))