Minor corrections from merge.

optimer/migrations/0003_make_strings_more_stringy.py

@@ -8,15 +8,10 @@ from django.db import migrations, models
 class Migration(migrations.Migration):
 
     dependencies = [
-        ('optimer', '0001_initial'),
+        ('optimer', '0002_auto_20170413_0442'),
     ]
 
     operations = [
-        migrations.AlterField(
-            model_name='optimer',
-            name='details',
-            field=models.CharField(default='', max_length=254),
-        ),
         migrations.AlterField(
             model_name='optimer',
             name='doctrine',
@@ -32,11 +27,6 @@ class Migration(migrations.Migration):
             name='fc',
             field=models.CharField(default='', max_length=254),
         ),
-        migrations.AlterField(
-            model_name='optimer',
-            name='location',
-            field=models.CharField(default='', max_length=254),
-        ),
         migrations.AlterField(
             model_name='optimer',
             name='operation_name',

optimer/views.py

@@ -18,10 +18,10 @@ logger = logging.getLogger(__name__)
 @permission_required('auth.optimer_view')
 def optimer_view(request):
     logger.debug("optimer_view called by user %s" % request.user)
-    render_items = {'optimer': optimer.objects.all(),
-                    'future_timers': optimer.objects.all().filter(
+    render_items = {'optimer': OpTimer.objects.all(),
+                    'future_timers': OpTimer.objects.all().filter(
                         start__gte=timezone.now()),
-                    'past_timers': optimer.objects.all().filter(
+                    'past_timers': OpTimer.objects.all().filter(
                         start__lt=timezone.now()).order_by('-start')}
 
     return render(request, 'registered/operationmanagement.html', context=render_items)