NotificationsYou must be signed in to change notification settings
Fork0
Star0

Commitbc3d891

authored

Check package only benefits as well (python#1670)

A package only benefit's checkbox is rendered in the HTML with thedisabled attribute. Because of that, the click event wasn't beingtriggered by the browser. This fix turn off and on this attribute sothe click event can happen.

1 parente4a3d88 commitbc3d891Copy full SHA for bc3d891

File tree

2 files changed

+13

-3

lines changed

static/js/sponsors
- applicationForm.js
templates/sponsors
- sponsorship_benefits_form.html

2 files changed

+13

-3

lines changed

`‎static/js/sponsors/applicationForm.js`

Lines changed: 12 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -17,12 +17,17 @@ $(document).ready(function(){`
`17`	`17`
`18`	`18`	`checkboxesContainer.find(':checkbox').each(function(){`
`19`	`19`	`$(this).prop('checked',false);`
	`20`	`+letpackageOnlyBenefit=$(this).attr("package_only");`
	`21`	`+if(packageOnlyBenefit)$(this).attr("disabled",true);`
`20`	`22`	`});`
`21`	`23`
`22`	`24`	`letpackageInfo=$("#package_benefits_"+package);`
`23`	`25`	`packageInfo.children().each(function(){`
`24`	`26`	`letbenefit=$(this).html()`
`25`		-checkboxesContainer.find(`[value=${benefit}]`).trigger("click");
	`27`	+letbenefitInput=checkboxesContainer.find(`[value=${benefit}]`);
	`28`	`+letpackageOnlyBenefit=benefitInput.attr("package_only");`
	`29`	`+benefitInput.removeAttr("disabled");`
	`30`	`+benefitInput.trigger("click");`
`26`	`31`	`});`
`27`	`32`
`28`	`33`	`leturl=$("#cost_container").attr("calculate_cost_url");`
`@@ -38,7 +43,12 @@ $(document).ready(function(){`
`38`	`43`	`if(costLabel.html()!="Updating cost...")costLabel.html("Submit your application and we'll get in touch...");`
`39`	`44`
`40`	`45`	letactive=checkboxesContainer.find(`[value=${benefit}]`).prop("checked");
`41`		`-if(!active)return;`
	`46`	`+if(!active){`
	`47`	`+letpackageOnlyBenefit=$(this).attr("package_only");`
	`48`	`+if(packageOnlyBenefit)$(this).attr("disabled",true);`
	`49`	`+return;`
	`50`	`+}`
	`51`	`+`
`42`	`52`
`43`	`53`	$(`#conflicts_with_${benefit}`).children().each(function(){
`44`	`54`	`letconflictId=$(this).html();`

`‎templates/sponsors/sponsorship_benefits_form.html`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -48,7 +48,7 @@ <h3 class="title">{{ field.label }}</h3>`
`48`	`48`	`{% for benefit in field.field.queryset %}`
`49`	`49`	`<liclass="{% cycle '' 'highlight' %}">`
`50`	`50`	`<labelfor="id_{{field.name}}_{{ forloop.counter0 }}"title="{{ benefit.unavailability_message }}">`
`51`		`-<inputid="id_{{field.name}}_{{ forloop.counter0 }}"name="{{ field.name }}"type="checkbox"value="{{ benefit.id }}"{%ifbenefit.unavailability_message%}disabled{%endif%}{%ifbenefit.idinfield.initial%}checked{%endif%}>`
	`51`	`+<inputid="id_{{field.name}}_{{ forloop.counter0 }}"name="{{ field.name }}"type="checkbox"value="{{ benefit.id }}"{%ifbenefit.unavailability_message%}disabled{%endif%}{%ifbenefit.idinfield.initial%}checked{%endif%}{%ifbenefit.package_only%}package_only='true'{%endif%}>`
`52`	`52`	`{{ benefit.name }}`
`53`	`53`	`{% if benefit.new %}<spanclass="fa fa-asterisk"></span>{% endif %}`
`54`	`54`	`{% if benefit.package_only %}<iclass="fa fa-cubes"></i>{% endif %}`

0 commit comments

Comments

(0)

Movatterモバイル変換

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commitbc3d891

File tree

2 files changed

2 files changed

`‎static/js/sponsors/applicationForm.js`

`‎templates/sponsors/sponsorship_benefits_form.html`

0 commit comments