This is actually, really a list.
ClosedPublic
Actions

Authored by ralph on Jul 16 2014, 3:52 AM.

Details

Reviewers

tflink
jskladan

Commits

rRSDB72ce429c1c68: This is actually, really a list.

Summary

There was a bug in the original fix to T207.

Test Plan

Same test plan as before:

Getting a result url with callback=wat currently gives:

[u'wat']({ "data": [], "href": "http://resultsdb-stg.cloud.fedoraproject.org/resultsdb/api/v1.0/results?callback=wat&item=kernel-3.14.5-200.fc20.i686.rpm", "next": "http://resultsdb-stg.cloud.fedoraproject.org/resultsdb/api/v1.0/results?callback=wat&item=kernel-3.14.5-200.fc20.i686.rpm&page=1", "prev": null });

It should give:

wat({ "data": [], "href": "http://resultsdb-stg.cloud.fedoraproject.org/resultsdb/api/v1.0/results?callback=wat&item=kernel-3.14.5-200.fc20.i686.rpm", "next": "http://resultsdb-stg.cloud.fedoraproject.org/resultsdb/api/v1.0/results?callback=wat&item=kernel-3.14.5-200.fc20.i686.rpm&page=1", "prev": null });

Diff Detail

Repository

rRSDB resultsdb

Lint

Lint Skipped

Unit

Unit Tests Skipped

ralph retitled this revision from to This is actually, really a list..Jul 16 2014, 3:52 AM

ralph updated this object.

ralph edited the test plan for this revision. (Show Details)

ralph added reviewers: tflink, jskladan.

Herald added a subscriber: tflink. · View Herald TranscriptJul 16 2014, 3:52 AM

So sorry on the delay for this but it looks good to me

This revision is now accepted and ready to land.Aug 6 2014, 11:46 AM

Closed by commit rRSDB72ce429c1c68 (authored by @ralph).

Revision Contents

			Path	Packages
M			resultsdb/__init__.py (1 line)

Diff	ID	Base	Description	Created	Lint	Unit
Base			Base
Diff 1	550	d05c620		Jul 16 2014, 3:52 AM	★	★
Diff 2	582	d05c620	Commit rRSDB72ce429c1c68073780178566163927f75cdaec94	Jul 16 2014, 3:52 AM	★	★

Commit	Tree	Parents	Author	Summary	Date
e4bc58c0bf31	331096d79a83	d05c620ce8d7	Ralph Bean	This is actually, really a list. (Show More…)	Jul 16 2014, 3:48 AM

Diff 582

View Options

resultsdb/init.py

Show First 20 Lines • Show All 42 Lines • ▼ Show 20 Line(s)
43	# Monkey patch Flask's "jsonify" to also handle JSONP	43	# Monkey patch Flask's "jsonify" to also handle JSONP
44	original_jsonify = flask.jsonify	44	original_jsonify = flask.jsonify
45		45
46	def jsonify_with_jsonp(args, *kwargs):	46	def jsonify_with_jsonp(args, *kwargs):
47	response = original_jsonify(args, *kwargs)	47	response = original_jsonify(args, *kwargs)
48	callback = flask.request.args.get('callback')	48	callback = flask.request.args.get('callback')
49		49
50	if callback:	50	if callback:
		51	callback = callback[0]
51	response.mimetype = 'application/javascript'	52	response.mimetype = 'application/javascript'
52	response.set_data('%s(%s);' % (callback, response.get_data()))	53	response.set_data('%s(%s);' % (callback, response.get_data()))
53		54
54	return response	55	return response
55		56
56	flask.jsonify = jsonify_with_jsonp	57	flask.jsonify = jsonify_with_jsonp
57		58
58	# Load default config, then override that with a config file	59	# Load default config, then override that with a config file
▲ Show 20 Lines • Show All 84 Lines • Show Last 20 Lines