Simplify non-active user page
Currently, the logic of whether a user account has been activated is in the main user.html template. This is not good as: doing that check for all users from template code is probably not great for performance, but more severly, the template logic is rather difficult and convoluted. Split this in a user.html and a user_nonactive.html where user.html is used for active users and user_nonactive displays all the "you still need to be activated" blurbs. This makes the templates much easier on the eyes.
This commit is contained in:
@@ -47,16 +47,13 @@ _log.setLevel(logging.DEBUG)
|
||||
@uses_pagination
|
||||
def user_home(request, page):
|
||||
"""'Homepage' of a User()"""
|
||||
# TODO: decide if we only want homepages for active users, we can
|
||||
# then use the @get_active_user decorator and also simplify the
|
||||
# template html.
|
||||
user = User.query.filter_by(username=request.matchdict['user']).first()
|
||||
if not user:
|
||||
return render_404(request)
|
||||
elif user.status != u'active':
|
||||
return render_to_response(
|
||||
request,
|
||||
'mediagoblin/user_pages/user.html',
|
||||
'mediagoblin/user_pages/user_nonactive.html',
|
||||
{'user': user})
|
||||
|
||||
cursor = MediaEntry.query.\
|
||||
|
||||
Reference in New Issue
Block a user