Merge pull request #1 from smajda/django_1.7

Fixes for Django >= 1.7

broadcasts/forms.py

@@ -10,6 +10,7 @@ class BroadcastMessageForm(forms.ModelForm):
 
     class Meta:
         model = BroadcastMessage
+        fields = ('message', 'start_time', 'end_time', 'is_published')
 
     def clean(self):
         """Ensure that the start time precedes the end time"""

broadcasts/migrations/0001_initial.py

@@ -1,39 +1,26 @@
-# encoding: utf-8
-import datetime
-from south.db import db
-from south.v2 import SchemaMigration
-from django.db import models
+# -*- coding: utf-8 -*-
+from __future__ import unicode_literals
 
-class Migration(SchemaMigration):
+from django.db import models, migrations
 
-    def forwards(self, orm):
-
-        # Adding model 'BroadcastMessage'
-        db.create_table('broadcasts_broadcastmessage', (
-            ('id', self.gf('django.db.models.fields.AutoField')(primary_key=True)),
-            ('message', self.gf('django.db.models.fields.CharField')(max_length=140)),
-            ('start_time', self.gf('django.db.models.fields.DateTimeField')(null=True, blank=True)),
-            ('end_time', self.gf('django.db.models.fields.DateTimeField')()),
-            ('is_published', self.gf('django.db.models.fields.BooleanField')(default=True)),
-        ))
-        db.send_create_signal('broadcasts', ['BroadcastMessage'])
 
+class Migration(migrations.Migration):
 
-    def backwards(self, orm):
-
-        # Deleting model 'BroadcastMessage'
-        db.delete_table('broadcasts_broadcastmessage')
+    dependencies = [
+    ]
 
-
-    models = {
-        'broadcasts.broadcastmessage': {
-            'Meta': {'ordering': "['-end_time']", 'object_name': 'BroadcastMessage'},
-            'end_time': ('django.db.models.fields.DateTimeField', [], {}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'is_published': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
-            'message': ('django.db.models.fields.CharField', [], {'max_length': '140'}),
-            'start_time': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'})
-        }
-    }
-
-    complete_apps = ['broadcasts']
+    operations = [
+        migrations.CreateModel(
+            name='BroadcastMessage',
+            fields=[
+                ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)),
+                ('message', models.CharField(max_length=140)),
+                ('start_time', models.DateTimeField(help_text=b'Optional, used to start showing a message in the\n            future', null=True, blank=True)),
+                ('end_time', models.DateTimeField(help_text=b'When this message should\n            expire')),
+                ('is_published', models.BooleanField(default=True, verbose_name=b'Published?')),
+            ],
+            options={
+                'ordering': ['-end_time'],
+            },
+        ),
+    ]

broadcasts/south_migrations/0001_initial.py

@@ -0,0 +1,39 @@
+# encoding: utf-8
+import datetime
+from south.db import db
+from south.v2 import SchemaMigration
+from django.db import models
+
+class Migration(SchemaMigration):
+
+    def forwards(self, orm):
+
+        # Adding model 'BroadcastMessage'
+        db.create_table('broadcasts_broadcastmessage', (
+            ('id', self.gf('django.db.models.fields.AutoField')(primary_key=True)),
+            ('message', self.gf('django.db.models.fields.CharField')(max_length=140)),
+            ('start_time', self.gf('django.db.models.fields.DateTimeField')(null=True, blank=True)),
+            ('end_time', self.gf('django.db.models.fields.DateTimeField')()),
+            ('is_published', self.gf('django.db.models.fields.BooleanField')(default=True)),
+        ))
+        db.send_create_signal('broadcasts', ['BroadcastMessage'])
+
+
+    def backwards(self, orm):
+
+        # Deleting model 'BroadcastMessage'
+        db.delete_table('broadcasts_broadcastmessage')
+
+
+    models = {
+        'broadcasts.broadcastmessage': {
+            'Meta': {'ordering': "['-end_time']", 'object_name': 'BroadcastMessage'},
+            'end_time': ('django.db.models.fields.DateTimeField', [], {}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'is_published': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
+            'message': ('django.db.models.fields.CharField', [], {'max_length': '140'}),
+            'start_time': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'})
+        }
+    }
+
+    complete_apps = ['broadcasts']