heckyel/mediagoblin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Functioning request.user, and a functioning greeting for users :)

Browse Source
This commit is contained in:
Christopher Allan Webber 2011-04-03 18:55:55 -05:00
parent a3fdcf5ce0
commit 59dd5c7e96
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
mediagoblin/templates/mediagoblin/base.html
View File

@ -29,7 +29,7 @@
<tr> <tr>
<td></td> <td></td>
<td> <td>
Welcome {{ user['username'] }}! -- Welcome {{ request.user['username'] }}! --
<a href="{{ request.urlgen('mediagoblin.auth.logout') }}"> <a href="{{ request.urlgen('mediagoblin.auth.logout') }}">
Logout</a> Logout</a>
</td> </td>

4
mediagoblin/util.py
View File

@ -34,12 +34,14 @@ def setup_user_in_request(request):
appropriate. appropriate.
""" """
if not request.session.has_key('user_id'): if not request.session.has_key('user_id'):
request.user = None
return return
user = None user = None
try: try:
user = request.db.User.one({'_id': request.session['user_id']}) user = request.db.User.one(
{'_id': mongokit.ObjectId(request.session['user_id'])})
if not user: if not user:
# Something's wrong... this user doesn't exist? Invalidate # Something's wrong... this user doesn't exist? Invalidate