5 files changed, 81 insertions, 4 deletions
diff --git a/app/daily/admin.py b/app/daily/admin.py
index 30b3c79..b468301 100644
--- a/app/daily/admin.py
+++ b/app/daily/admin.py
@@ -10,16 +10,16 @@ class WeatherAdmin(OSMGeoAdmin):
 
 
 class DailyAdmin(OSMGeoAdmin):
-    list_display = ('date', 'location')
+    form = LGEntryForm
+    list_display = ('date', 'user', 'location')
     list_filter = (
         'date',
         ('location', admin.RelatedOnlyFieldListFilter),
     )
-    form = LGEntryForm
     fieldsets = (
         (None, {
             'fields': (
-                'title',
+                'user',
                 'body_markdown',
                 'weather_human',
             )
@@ -34,6 +34,11 @@ class DailyAdmin(OSMGeoAdmin):
         }),
     )
 
+    def get_form(self, request, obj=None, **kwargs):
+        form = super(DailyAdmin, self).get_form(request, **kwargs)
+        form.current_user = request.user
+        return form
+
 
 class CheckInAdmin(OSMGeoAdmin):
     list_display = ('date', 'location')
diff --git a/app/daily/migrations/0008_auto_20160124_0914.py b/app/daily/migrations/0008_auto_20160124_0914.py
new file mode 100644
index 0000000..477fe99
--- /dev/null
+++ b/app/daily/migrations/0008_auto_20160124_0914.py
@@ -0,0 +1,31 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.9 on 2016-01-24 09:14
+from __future__ import unicode_literals
+
+from django.conf import settings
+from django.db import migrations, models
+import django.db.models.deletion
+from django.contrib.auth.models import User
+lux = User.objects.get(username="luxagraf")
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        migrations.swappable_dependency(settings.AUTH_USER_MODEL),
+        ('daily', '0007_auto_20160119_1604'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='daily',
+            name='user',
+            field=models.OneToOneField(default=lux.id, on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL),
+            preserve_default=False,
+        ),
+        migrations.AlterField(
+            model_name='daily',
+            name='date',
+            field=models.DateField(),
+        ),
+    ]
diff --git a/app/daily/migrations/0009_auto_20160124_1622.py b/app/daily/migrations/0009_auto_20160124_1622.py
new file mode 100644
index 0000000..c7bde07
--- /dev/null
+++ b/app/daily/migrations/0009_auto_20160124_1622.py
@@ -0,0 +1,22 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.9 on 2016-01-24 16:22
+from __future__ import unicode_literals
+
+from django.conf import settings
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('daily', '0008_auto_20160124_0914'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='daily',
+            name='user',
+            field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL),
+        ),
+    ]
diff --git a/app/daily/migrations/0010_remove_daily_title.py b/app/daily/migrations/0010_remove_daily_title.py
new file mode 100644
index 0000000..6e4d08c
--- /dev/null
+++ b/app/daily/migrations/0010_remove_daily_title.py
@@ -0,0 +1,19 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.9 on 2016-01-24 16:27
+from __future__ import unicode_literals
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('daily', '0009_auto_20160124_1622'),
+    ]
+
+    operations = [
+        migrations.RemoveField(
+            model_name='daily',
+            name='title',
+        ),
+    ]
diff --git a/app/daily/models.py b/app/daily/models.py
index be5b7fd..a0a6d5b 100644
--- a/app/daily/models.py
+++ b/app/daily/models.py
@@ -65,10 +65,10 @@ class Weather(models.Model):
 
 
 class Daily(models.Model):
+    user = models.ForeignKey(settings.AUTH_USER_MODEL)
     location = models.ForeignKey(Location, blank=True, null=True)
     weather = models.ForeignKey(Weather, blank=True, null=True)
     weather_human = models.TextField(blank=True, null=True)
-    title = models.CharField(max_length=200, blank=True, null=True)
     body_html = models.TextField(blank=True, null=True)
     body_markdown = models.TextField(blank=True, null=True)
     date = models.DateField()