This should allow for request.user and show users logged in

... except it's not working?
This commit is contained in:
Christopher Allan Webber 2011-04-03 18:40:01 -05:00
parent 5d6840a010
commit a3fdcf5ce0
2 changed files with 20 additions and 2 deletions

View File

@ -79,9 +79,9 @@ class MediagoblinApp(object):
request.template_env = self.template_env request.template_env = self.template_env
request.urlgen = routes.URLGenerator(self.routing, environ) request.urlgen = routes.URLGenerator(self.routing, environ)
request.db = self.db request.db = self.db
# Do we really want to load this via middleware? Maybe? # Do we really want to load this via middleware? Maybe?
request.session = request.environ['beaker.session'] request.session = request.environ['beaker.session']
util.setup_user_in_request(request)
return controller(request)(environ, start_response) return controller(request)(environ, start_response)

View File

@ -22,9 +22,27 @@
<td></td> <td></td>
<td> <td>
{% block mediagoblin_header_subtitle %} {% block mediagoblin_header_subtitle %}
perhaps some subtitle here Clever subtitle here!
{% endblock %}</td> {% endblock %}</td>
</tr> </tr>
{% if request.user %}
<tr>
<td></td>
<td>
Welcome {{ user['username'] }}! --
<a href="{{ request.urlgen('mediagoblin.auth.logout') }}">
Logout</a>
</td>
</tr>
{% else %}
<tr>
<td></td>
<td>
<a href="{{ request.urlgen('mediagoblin.auth.login') }}">
Login</a>
</td>
</tr>
{% endif %}
</table> </table>
{% endblock %} {% endblock %}
<div id="mediagoblin_content"> <div id="mediagoblin_content">