| lbrabec |
ID of non-existing job/result/testcase is now handled gracefully, error message is shown instead of error 500.
jobs/60908 doesnt yield err 500, err message is shown
| No Linters Available |
| No Unit Test Coverage |
| Path | Packages | |||
|---|---|---|---|---|
| M | resultsdb_frontend/controllers/main.py (17 lines) |
| Commit | Tree | Parents | Author | Summary | Date |
|---|---|---|---|---|---|
| 32678cfe04e2 | 20ebd7960dea | e1f37b945c42 | Lukas Brabec | handling wrong IDs (404) (Show More…) | Feb 25 2015, 10:37 AM |
| Show All 14 Lines | |||||
| 15 | # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. | 15 | # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. | ||
| 16 | # | 16 | # | ||
| 17 | # Authors: | 17 | # Authors: | ||
| 18 | # Josef Skladanka <jskladan@redhat.com> | 18 | # Josef Skladanka <jskladan@redhat.com> | ||
| 19 | 19 | | |||
| 20 | from flask import Blueprint, render_template, redirect, url_for, request | 20 | from flask import Blueprint, render_template, redirect, url_for, request | ||
| 21 | from resultsdb_frontend import app | 21 | from resultsdb_frontend import app | ||
| 22 | 22 | | |||
| 23 | from resultsdb_api import ResultsDBapi | 23 | from resultsdb_api import ResultsDBapi, ResultsDBapiException | ||
| 24 | 24 | | |||
| 25 | rdb_api = None | 25 | rdb_api = None | ||
| 26 | 26 | | |||
| 27 | 27 | | |||
| 28 | main = Blueprint('main', __name__) | 28 | main = Blueprint('main', __name__) | ||
| 29 | 29 | | |||
| 30 | @app.before_first_request | 30 | @app.before_first_request | ||
| 31 | def before_first_request(): | 31 | def before_first_request(): | ||
| 32 | global rdb_api | 32 | global rdb_api | ||
| 33 | rdb_api = ResultsDBapi(app.config['RDB_URL']) | 33 | rdb_api = ResultsDBapi(app.config['RDB_URL']) | ||
| 34 | 34 | | |||
| 35 | @main.route('/') | 35 | @main.route('/') | ||
| 36 | @main.route('/index') | 36 | @main.route('/index') | ||
| 37 | def index(): | 37 | def index(): | ||
| 38 | return redirect(url_for('main.jobs')) | 38 | return redirect(url_for('main.jobs')) | ||
| 39 | 39 | | |||
| 40 | @main.route('/jobs') | 40 | @main.route('/jobs') | ||
| 41 | def jobs(): | 41 | def jobs(): | ||
| 42 | jobs = rdb_api.get_jobs(**dict(request.args)) | 42 | jobs = rdb_api.get_jobs(**dict(request.args)) | ||
| 43 | return render_template('jobs.html', jobs = jobs) | 43 | return render_template('jobs.html', jobs = jobs) | ||
| 44 | 44 | | |||
| 45 | @main.route('/jobs/<job_id>') | 45 | @main.route('/jobs/<job_id>') | ||
| 46 | def job(job_id): | 46 | def job(job_id): | ||
| 47 | job = rdb_api.get_job(id = job_id) | 47 | try: | ||
| 48 | job = rdb_api.get_job(id = job_id) | ||||
| 49 | except ResultsDBapiException as e: | ||||
| 50 | return str(e) | ||||
| 48 | jobs = dict(prev = None, next = None, data = [job]) | 51 | jobs = dict(prev = None, next = None, data = [job]) | ||
| 49 | return render_template('jobs.html', jobs = jobs) | 52 | return render_template('jobs.html', jobs = jobs) | ||
| 50 | 53 | | |||
| 51 | @main.route('/results') | 54 | @main.route('/results') | ||
| 52 | def results(): | 55 | def results(): | ||
| 53 | args = dict(request.args) | 56 | args = dict(request.args) | ||
| 54 | if 'job_id' in args: | 57 | if 'job_id' in args: | ||
| 55 | args['job_id'] = request.args['job_id'] | 58 | args['job_id'] = request.args['job_id'] | ||
| 56 | results = rdb_api.get_results(**args) | 59 | results = rdb_api.get_results(**args) | ||
| 57 | return render_template('results.html', results = results) | 60 | return render_template('results.html', results = results) | ||
| 58 | 61 | | |||
| 59 | @main.route('/results/<result_id>') | 62 | @main.route('/results/<result_id>') | ||
| 60 | def result(result_id): | 63 | def result(result_id): | ||
| 61 | result = rdb_api.get_result(id = result_id) | 64 | try: | ||
| 65 | result = rdb_api.get_result(id = result_id) | ||||
| 66 | except ResultsDBapiException as e: | ||||
| 67 | return str(e) | ||||
| 62 | return render_template('result_detail.html', result = result) | 68 | return render_template('result_detail.html', result = result) | ||
| 63 | 69 | | |||
| 64 | @main.route('/testcases') | 70 | @main.route('/testcases') | ||
| 65 | def testcases(): | 71 | def testcases(): | ||
| 66 | args = dict(request.args) | 72 | args = dict(request.args) | ||
| 67 | tcs = rdb_api.get_testcases(**args) | 73 | tcs = rdb_api.get_testcases(**args) | ||
| 68 | return render_template('testcases.html', testcases = tcs) | 74 | return render_template('testcases.html', testcases = tcs) | ||
| 69 | 75 | | |||
| 70 | @main.route('/testcases/<testcase_name>') | 76 | @main.route('/testcases/<testcase_name>') | ||
| 71 | def testcase(testcase_name): | 77 | def testcase(testcase_name): | ||
| 72 | tc = rdb_api.get_testcase(name = testcase_name) | 78 | try: | ||
| 79 | tc = rdb_api.get_testcase(name = testcase_name) | ||||
| 80 | except ResultsDBapiException as e: | ||||
| 81 | return str(e) | ||||
| 73 | tcs = dict(prev = None, next = None, data = [tc]) | 82 | tcs = dict(prev = None, next = None, data = [tc]) | ||
| 74 | return render_template('testcases.html', testcases = tcs) | 83 | return render_template('testcases.html', testcases = tcs) | ||
| 75 | 84 | | |||