Merge branch '07-personalize-views'

scotwk · scotwk · commit 128a5791ed90 · 2015-05-05T09:44:20.000-04:00
diff --git a/Readme.md b/Readme.md
@@ -50,13 +50,13 @@ Modify models.py and admin.py to contain your first model.
 Apply changes to DB:
 ```
 $ ./manage.py makemigrations note
-$  ./manage.py migrate
+$ ./manage.py migrate
 ```
 
 You can now view this in the admin.
 
 
-Chapter 03 - customize the admin
+Chapter 03 - Customize the admin
 ----------
 
 Modify the `note/admin.py` file and see how the admin can be customized.
@@ -82,4 +82,18 @@ views use the `@login_required` decorator.
 Chapter 06 - Better templates and new users
 -----------------------------
 
-Copy in templates and add in urls for creating new users.
+Copy in templates and add in urls for creating new users.
+
+
+Chapter 07 - Associating notes with owners
+-------------------------
+
+Add an `owner` field to the model.  You'll need to run migrations.  You can use
+a default value of 0 for the migration.
+
+```
+$ ./manage.py makemigrations note
+$ ./manage.py migrate
+```
+
+Then, restrict the view on the index page so that a user can only see their own notes.
diff --git a/elevennote/note/admin.py b/elevennote/note/admin.py
@@ -2,7 +2,7 @@
 from .models import Note
 
 class NoteAdmin(admin.ModelAdmin):
-    list_display = ('title', 'pub_date', 'was_published_recently')
+    list_display = ('title', 'owner', 'pub_date', 'was_published_recently')
     list_filter = ['pub_date']
 
 # Register your models here.
diff --git a/elevennote/note/migrations/0002_note_owner.py b/elevennote/note/migrations/0002_note_owner.py
@@ -0,0 +1,22 @@
+# -*- coding: utf-8 -*-
+from __future__ import unicode_literals
+
+from django.db import models, migrations
+from django.conf import settings
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        migrations.swappable_dependency(settings.AUTH_USER_MODEL),
+        ('note', '0001_initial'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='note',
+            name='owner',
+            field=models.ForeignKey(default=0, to=settings.AUTH_USER_MODEL),
+            preserve_default=False,
+        ),
+    ]
diff --git a/elevennote/note/models.py b/elevennote/note/models.py
@@ -4,10 +4,11 @@
 # Django imports
 from django.db import models
 from django.utils import timezone
-
+from django.contrib.auth.models import User
 
 # Create your models here.
 class Note(models.Model):
+    owner = models.ForeignKey(User)
     title = models.CharField(max_length=200)
     body = models.TextField()
     pub_date = models.DateTimeField('date published')
diff --git a/elevennote/note/views.py b/elevennote/note/views.py
@@ -7,7 +7,7 @@
 
 @login_required
 def index(request):
-    latest_note_list = Note.objects.order_by('-pub_date')[:5]
+    latest_note_list = Note.objects.filter(owner=request.user).order_by('-pub_date')[:5]
     context = {
         'latest_note_list': latest_note_list,
     }

Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@`
`7`	`7`
`8`	`8`	`@login_required`
`9`	`9`	`def index(request):`
`10`		`- latest_note_list = Note.objects.order_by('-pub_date')[:5]`
	`10`	`+ latest_note_list = Note.objects.filter(owner=request.user).order_by('-pub_date')[:5]`
`11`	`11`	`context = {`
`12`	`12`	`'latest_note_list': latest_note_list,`
`13`	`13`	`}`