Fix proposal form processing to actually use submitted data. Fixes T848
ClosedPublic
Actions

Authored by tflink on Sep 28 2016, 11:21 PM.

Details

Reviewers

Maniphest Tasks

T848: Blockerbug proposal form always fails validation

Commits

rBLKRff5a8609f809: Merge branch 'develop' into 'master' for 0.4.4.11 release
rBLKRf3fd68156be7: Fix proposal form processing to actually use submitted data. Fixes T848

Summary

Changes the way that the bug proposal form is displayed in HTML and processed in Flask so that we're not dropping the submitted data needed to process the blocker request

Test Plan

Load the proposal page, note that the bugzilla username is filled out and the default milestone is properly set. Submit a test blocker/FE (doesn't need to actually go to BZ), make sure that no data was dropped from the form

Diff Detail

Repository

rBLKR blockerbugs

Lint

Automatic diff as part of commit; lint not applicable.

Unit

Automatic diff as part of commit; unit tests not applicable.

tflink retitled this revision from to Fix proposal form processing to actually use submitted data. Fixes T848.Sep 28 2016, 11:21 PM

tflink updated this object.

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

tflink added a reviewer: mkrizek.

tflink added a task: T848: Blockerbug proposal form always fails validation.Sep 28 2016, 11:21 PM

Thanks for the fix. I could have sworn it worked for me when I tested the patch. :/

I wonder what broke disabled=True. Hasn't it been working for a while now?

This revision is now accepted and ready to land.Sep 29 2016, 10:25 AM

In D1017#19146, @mkrizek wrote:

Thanks for the fix. I could have sworn it worked for me when I tested the patch. :/

I wonder what broke disabled=True. Hasn't it been working for a while now?

It was the bugform.process() that changed things. We weren't setting the default before, so that call wasn't needed and without that call, it didn't care that the bz_user field didn't exist in the request.form of the POST request.

Closed by commit rBLKRf3fd68156be7: Fix proposal form processing to actually use submitted data. Fixes T848 (authored by tflink). · Explain WhySep 29 2016, 4:51 PM

This revision was automatically updated to reflect the committed changes.

Revision Contents

			Path	Packages
M			blockerbugs/controllers/main.py (8 lines)
M			blockerbugs/templates/propose_bug.html (2 lines)

Diff	ID	Base	Description	Created	Lint	Unit
Base			Base
Diff 1	2600	1ed6725		Sep 28 2016, 11:21 PM	★	★
Diff 2	2602	1ed6725	rBLKRf3fd68156be72bad79eb87b4e4380c2c355a40f3	Sep 28 2016, 11:21 PM	★	★

Commit	Tree	Parents	Author	Summary	Date
8c3291a4c4c6	ca8225ddca26	1ed6725801fd	Tim Flink	Fix proposal form processing to actually use submitted data. Fixes T848 (Show More…)	Sep 28 2016, 11:19 PM

Diff 2602

View Options

blockerbugs/controllers/main.py

Show All 14 Lines
15	#	15	#
16	# You should have received a copy of the GNU General Public License along	16	# You should have received a copy of the GNU General Public License along
17	# with this program; if not, write to the Free Software Foundation, Inc.,	17	# with this program; if not, write to the Free Software Foundation, Inc.,
18	# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.	18	# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
19	#	19	#
20	# Authors:	20	# Authors:
21	# Tim Flink <tflink@redhat.com>	21	# Tim Flink <tflink@redhat.com>
22		22
23	from flask import Blueprint, render_template, redirect, url_for, abort, g, flash, make_response	23	from flask import Blueprint, render_template, redirect, url_for, abort, g, flash, make_response, request
24	import datetime	24	import datetime
25	from sqlalchemy import func, desc, or_	25	from sqlalchemy import func, desc, or_
26	import bugzilla	26	import bugzilla
27	from flask_fas_openid import fas_login_required	27	from flask_fas_openid import fas_login_required
28		28
29	from blockerbugs import app, db	29	from blockerbugs import app, db
30	from blockerbugs.util.bz_interface import BlockerProposal, BZInterfaceError	30	from blockerbugs.util.bz_interface import BlockerProposal, BZInterfaceError
31	from blockerbugs.models.bug import Bug	31	from blockerbugs.models.bug import Bug
▲ Show 20 Lines • Show All 346 Lines • ▼ Show 20 Line(s)
378	@fas_login_required	378	@fas_login_required
379	def propose_bug():	379	def propose_bug():
380	user_info = UserInfo.query.filter_by(fas_login=g.fas_user.username).first()	380	user_info = UserInfo.query.filter_by(fas_login=g.fas_user.username).first()
381	if not user_info or not user_info.bz_user:	381	if not user_info or not user_info.bz_user:
382	return redirect(url_for('.fas_bugzilla'))	382	return redirect(url_for('.fas_bugzilla'))
383		383
384	current_milestone = get_current_milestone()	384	current_milestone = get_current_milestone()
385	bugform = BugProposeForm()	385	bugform = BugProposeForm()
386	bugform.bz_user.data = user_info.bz_user
387	bugform.milestone.choices = [(m.id, m.name) for m in Milestone.query.filter_by(active=True).order_by(Milestone.id).all()]	386	bugform.milestone.choices = [(m.id, m.name) for m in Milestone.query.filter_by(active=True).order_by(Milestone.id).all()]
388	bugform.milestone.default = current_milestone.id	387	bugform.milestone.default = current_milestone.id
389	bugform.process()	388
		389	# we have to process the form after setting the milestone default so that it is properly set
		390	# by passing in the request.form, anything submitted as part of a POST will be inserted as form data
		391	bugform.process(request.form, bz_user = user_info.bz_user)
390		392
391	if bugform.validate_on_submit():	393	if bugform.validate_on_submit():
392	app.logger.debug('bugid: %i' % bugform.bugid.data)	394	app.logger.debug('bugid: %i' % bugform.bugid.data)
393	app.logger.debug('bz_user: %s' % user_info.bz_user)	395	app.logger.debug('bz_user: %s' % user_info.bz_user)
394	app.logger.debug('milestone: %i' % bugform.milestone.data)	396	app.logger.debug('milestone: %i' % bugform.milestone.data)
395	app.logger.debug('blocker: %s' % unicode(bugform.blocker.data))	397	app.logger.debug('blocker: %s' % unicode(bugform.blocker.data))
396	app.logger.debug('freeze_exception: %s' % unicode(bugform.freeze_exception.data))	398	app.logger.debug('freeze_exception: %s' % unicode(bugform.freeze_exception.data))
397	app.logger.debug('justification: %s' % unicode(bugform.justification.data))	399	app.logger.debug('justification: %s' % unicode(bugform.justification.data))
▲ Show 20 Lines • Show All 53 Lines • Show Last 20 Lines