cleanup
This commit is contained in:
@@ -170,6 +170,8 @@ def log_out():
|
|||||||
@redirect_if_logged_in()
|
@redirect_if_logged_in()
|
||||||
def sign_up():
|
def sign_up():
|
||||||
key = request.args.get('key', '')
|
key = request.args.get('key', '')
|
||||||
|
invite = None
|
||||||
|
inviter = None
|
||||||
if not key and current_app.config['DISABLE_SIGNUP']:
|
if not key and current_app.config['DISABLE_SIGNUP']:
|
||||||
return redirect(url_for('topics.all_topics'))
|
return redirect(url_for('topics.all_topics'))
|
||||||
elif key and current_app.config['DISABLE_SIGNUP']:
|
elif key and current_app.config['DISABLE_SIGNUP']:
|
||||||
@@ -188,6 +190,7 @@ def sign_up_post():
|
|||||||
invalid_username_error_page = redirect(url_for('.sign_up', error='This username cannot be used. Please pick another.', **args_sans_error))
|
invalid_username_error_page = redirect(url_for('.sign_up', error='This username cannot be used. Please pick another.', **args_sans_error))
|
||||||
passwords_error_page = redirect(url_for('.sign_up', error='The passwords do not match.', **args_sans_error))
|
passwords_error_page = redirect(url_for('.sign_up', error='The passwords do not match.', **args_sans_error))
|
||||||
username = request.form.get('username', default='')
|
username = request.form.get('username', default='')
|
||||||
|
invite = None
|
||||||
if current_app.config['DISABLE_SIGNUP']:
|
if current_app.config['DISABLE_SIGNUP']:
|
||||||
key = request.form.get('key', '')
|
key = request.form.get('key', '')
|
||||||
if not key:
|
if not key:
|
||||||
@@ -254,6 +257,8 @@ def user_page(username):
|
|||||||
abort(404)
|
abort(404)
|
||||||
if current_app.config['DISABLE_SIGNUP'] and target_user.invited_by:
|
if current_app.config['DISABLE_SIGNUP'] and target_user.invited_by:
|
||||||
invited_by = Users.find({'id': target_user.invited_by})
|
invited_by = Users.find({'id': target_user.invited_by})
|
||||||
|
else:
|
||||||
|
invited_by = None
|
||||||
return render_template('users/user_page.html', target_user=target_user, invited_by=invited_by)
|
return render_template('users/user_page.html', target_user=target_user, invited_by=invited_by)
|
||||||
|
|
||||||
@bp.get('/<username>/posts/')
|
@bp.get('/<username>/posts/')
|
||||||
@@ -276,7 +281,7 @@ def posts(username):
|
|||||||
return render_template(
|
return render_template(
|
||||||
'users/posts.html', posts=posts,
|
'users/posts.html', posts=posts,
|
||||||
page=page, page_count=page_count,
|
page=page, page_count=page_count,
|
||||||
target_user=target_user, Reactions=Reactions
|
target_user=target_user,
|
||||||
)
|
)
|
||||||
|
|
||||||
@bp.get('/<username>/threads/')
|
@bp.get('/<username>/threads/')
|
||||||
@@ -299,7 +304,7 @@ def threads(username):
|
|||||||
return render_template(
|
return render_template(
|
||||||
'users/threads.html', threads=threads,
|
'users/threads.html', threads=threads,
|
||||||
page=page, page_count=page_count,
|
page=page, page_count=page_count,
|
||||||
target_user=target_user, Reactions=Reactions
|
target_user=target_user,
|
||||||
)
|
)
|
||||||
|
|
||||||
@bp.get('/<username>/comments/')
|
@bp.get('/<username>/comments/')
|
||||||
@@ -442,7 +447,6 @@ def set_personalization(username):
|
|||||||
parsed_content = babycode_to_html(rev.original_markup).result
|
parsed_content = babycode_to_html(rev.original_markup).result
|
||||||
rev.update({'content': parsed_content})
|
rev.update({'content': parsed_content})
|
||||||
|
|
||||||
|
|
||||||
flash('Personalization settings updated.', InfoboxKind.INFO)
|
flash('Personalization settings updated.', InfoboxKind.INFO)
|
||||||
return redirect(url_for('.settings', username=username))
|
return redirect(url_for('.settings', username=username))
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user