diff options
| author | Christian Pointner <equinox@helsinki.at> | 2016-08-03 18:02:10 (GMT) |
|---|---|---|
| committer | Christian Pointner <equinox@helsinki.at> | 2016-08-03 18:02:10 (GMT) |
| commit | e1dd7af199984d7ef3c875c88e39aee06d538370 (patch) | |
| tree | 55a537e25b25089f91bf19e0ee042dda7089b71b /program | |
| parent | 31406aa5c3c53341cdadbc760b95d234ccdc20c6 (diff) | |
| parent | bb828a37309ab297fc8d50ef261bbfc14c871a6e (diff) | |
Merge branch 'master' into stable
Diffstat (limited to 'program')
| -rw-r--r-- | program/admin.py | 2 | ||||
| -rw-r--r-- | program/migrations/0008_show_remove_automation_id.py | 18 | ||||
| -rw-r--r-- | program/models.py | 1 |
3 files changed, 19 insertions, 2 deletions
diff --git a/program/admin.py b/program/admin.py index 591c363..b840d03 100644 --- a/program/admin.py +++ b/program/admin.py @@ -110,7 +110,7 @@ class ShowAdmin(admin.ModelAdmin): search_fields = ('name', 'short_description', 'description') fields = ( 'predecessor', 'broadcastformat', 'name', 'slug', 'image', 'image_enabled', 'short_description', 'description', - 'email', 'website', 'automation_id', 'hosts', 'owners', 'showinformation', 'showtopic', + 'email', 'website', 'hosts', 'owners', 'showinformation', 'showtopic', 'musicfocus', ) diff --git a/program/migrations/0008_show_remove_automation_id.py b/program/migrations/0008_show_remove_automation_id.py new file mode 100644 index 0000000..eda14c5 --- /dev/null +++ b/program/migrations/0008_show_remove_automation_id.py @@ -0,0 +1,18 @@ +# -*- coding: utf-8 -*- +from __future__ import unicode_literals + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('program', '0007_show_remove_cba_series_id'), + ] + + operations = [ + migrations.RemoveField( + model_name='show', + name='automation_id', + ), + ] diff --git a/program/models.py b/program/models.py index eef8f93..b11d180 100644 --- a/program/models.py +++ b/program/models.py @@ -244,7 +244,6 @@ class Show(models.Model): email = models.EmailField(_("E-Mail"), blank=True, null=True) website = models.URLField(_("Website"), blank=True, null=True) is_active = models.BooleanField(_("Is active"), default=True, editable=False) - automation_id = models.IntegerField(_("Automation ID"), blank=True, null=True, choices=get_automation_id_choices()) created = models.DateTimeField(auto_now_add=True, editable=False) last_updated = models.DateTimeField(auto_now=True, editable=False) |