Merge branch 'dev' into dependabot/pip/urllib3-1.26.3

This commit is contained in:
Dan Funk 2021-04-02 12:42:59 -04:00 committed by GitHub
commit 4180fbd433
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 6 additions and 6 deletions

8
Pipfile.lock generated
View File

@ -300,6 +300,7 @@
"sha256:03e47ad063331dd6a3f04a43eddca8a966a26ba0c5b7207a9a9e4e08f1b29419",
"sha256:a6d58433de0ae800347cab1fa3043cebbabe8baa9d29e668f1c768cb87a333c6"
],
"index": "pypi",
"version": "==2.11.3"
},
"jsonschema": {
@ -615,11 +616,10 @@
},
"urllib3": {
"hashes": [
"sha256:1b465e494e3e0d8939b50680403e3aedaa2bc434b7d5af64dfd3c958d7f5ae80",
"sha256:de3eedaad74a2683334e282005cd8d7f22f4d55fa690a2a1020a416cb0a47e73"
"sha256:2f4da4594db7e1e110a944bb1b551fdf4e6c136ad42e4234131391e21eb5b0df",
"sha256:e7b021f7241115872f92f43c6508082facffbd1c048e3c6e2bb9c2a157e28937"
],
"index": "pypi",
"version": "==1.26.3"
"version": "==1.26.4"
},
"validators": {
"hashes": [

View File

@ -184,7 +184,7 @@ def index():
@app.route('/user_studies/<uva_id>', methods=['GET'])
def user_studies(uva_id):
if uva_id == 'all':
return redirect(f"/")
return redirect(BASE_HREF + "/")
studies = db.session.query(Study).filter(Study.NETBADGEID == uva_id).order_by(Study.DATE_MODIFIED.desc()).all()
return render_study_template(studies)

View File

@ -18,7 +18,7 @@
</p>
<p>
<label>User Studies</label>
<select name="uva_id" id="uva_id" onclick="selectStudies()">
<select name="uva_id" id="uva_id" onchange="selectStudies()">
<option value="">Select User</option>
<option value="all">All Users</option>
{% if users %}