jenkins-bot has submitted this change and it was merged.
Change subject: Don't die on a non-existent user page
......................................................................
Don't die on a non-existent user page
Bug: T105662
Change-Id: I8371a928154a6386b24cf10b5e1b49b294f59722
---
M quarry/web/user.py
1 file changed, 5 insertions(+), 1 deletion(-)
Approvals:
Yuvipanda: Looks good to me, approved
jenkins-bot: Verified
diff --git a/quarry/web/user.py b/quarry/web/user.py
index 8356d5a..d974021 100644
--- a/quarry/web/user.py
+++ b/quarry/web/user.py
@@ -1,4 +1,5 @@
from flask import Blueprint, session, redirect, g, render_template
+from sqlalchemy.orm.exc import NoResultFound
from sqlalchemy.orm import joinedload
from sqlalchemy import desc, func
from models.user import User, UserGroup
@@ -36,7 +37,10 @@
def user_page(user_name):
# Munge the user_name, and hope
user_name = user_name.replace('_', ' ').lower()
- user = g.conn.session.query(User).filter(func.lower(User.username) ==
user_name).one()
+ try:
+ user = g.conn.session.query(User).filter(func.lower(User.username) ==
user_name).one()
+ except NoResultFound:
+ return 'User not found', 404
stats = {
'query_count':
g.conn.session.query(func.count(Query.id)).filter(Query.user_id ==
user.id).scalar(),
'stars_count':
g.conn.session.query(func.count(Star.id)).filter(Star.user_id ==
user.id).scalar()
--
To view, visit https://gerrit.wikimedia.org/r/266021
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I8371a928154a6386b24cf10b5e1b49b294f59722
Gerrit-PatchSet: 4
Gerrit-Project: analytics/quarry/web
Gerrit-Branch: master
Gerrit-Owner: Alex Monk <[email protected]>
Gerrit-Reviewer: Yuvipanda <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
