Normalize Authorization in both tutorials 4

- Sync content of Add login and logout views,
  Add the login.pt template, Return a logged_in
  flag, Add a logout link sections
- Normalize sections of views.py

1 files changed, 5 insertions, 10 deletions

diff --git a/docs/tutorials/wiki/src/tests/tutorial/views.py b/docs/tutorials/wiki/src/tests/tutorial/views.py
index 3899e4d77..21f12b31d 100644
--- a/docs/tutorials/wiki/src/tests/tutorial/views.py
+++ b/docs/tutorials/wiki/src/tests/tutorial/views.py
@@ -9,9 +9,9 @@ from pyramid.view import (
     )
 
 from pyramid.security import (
-    authenticated_userid,
     remember,
     forget,
+    authenticated_userid,
     )
 
 from .security import USERS
@@ -44,10 +44,8 @@ def view_page(context, request):
     content = wikiwords.sub(check, content)
     edit_url = request.resource_url(context, 'edit_page')
 
-    logged_in = authenticated_userid(request)
-
     return dict(page = context, content = content, edit_url = edit_url,
-                logged_in = logged_in)
+                logged_in = authenticated_userid(request))
 
 @view_config(name='add_page', context='.models.Wiki',
              renderer='templates/edit.pt',
@@ -66,9 +64,8 @@ def add_page(context, request):
     page.__name__ = name
     page.__parent__ = context
 
-    logged_in = authenticated_userid(request)
-
-    return dict(page = page, save_url = save_url, logged_in = logged_in)
+    return dict(page = page, save_url = save_url,
+                logged_in = authenticated_userid(request))
 
 @view_config(name='edit_page', context='.models.Page',
              renderer='templates/edit.pt',
@@ -78,11 +75,9 @@ def edit_page(context, request):
         context.data = request.params['body']
         return HTTPFound(location = request.resource_url(context))
 
-    logged_in = authenticated_userid(request)
-
     return dict(page = context,
                 save_url = request.resource_url(context, 'edit_page'),
-                logged_in = logged_in)
+                logged_in = authenticated_userid(request))
 
 @view_config(context='.models.Wiki', name='login',
              renderer='templates/login.pt')