Skip to content

Commit 258419d

Browse files
authored
Remove code that stoped parents from being selected. (#4949)
Fixes #4945
1 parent 2863484 commit 258419d

2 files changed

Lines changed: 2 additions & 28 deletions

File tree

hypha/apply/funds/forms.py

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
from .models.co_applicants import CoApplicantProjectPermission, CoApplicantRole
2424
from .permissions import can_change_external_reviewers
2525
from .utils import model_form_initial, render_icon
26-
from .widgets import MetaTermWidget, MultiCheckboxesWidget
26+
from .widgets import MultiCheckboxesWidget
2727

2828

2929
class ApplicationSubmissionModelForm(forms.ModelForm):
@@ -382,19 +382,11 @@ def __init__(self, *args, choices_groupby, **kwargs):
382382
self.iterator = partial(GroupedModelChoiceIterator, groupby=choices_groupby)
383383
super().__init__(*args, **kwargs)
384384

385-
def label_from_instance(self, obj):
386-
return {
387-
"label": super().label_from_instance(obj),
388-
"disabled": not obj.is_leaf(),
389-
}
390-
391385

392386
class UpdateMetaTermsForm(ApplicationSubmissionModelForm):
393387
meta_terms = GroupedModelMultipleChoiceField(
394388
queryset=None, # updated in init method
395-
widget=MetaTermWidget(
396-
attrs={"data-placeholder": _("Select..."), "data-js-choices": ""}
397-
),
389+
widget=MultiCheckboxesWidget(attrs={"data-placeholder": _("Select...")}),
398390
label=_("Tags"),
399391
choices_groupby="get_parent",
400392
required=False,

hypha/apply/funds/widgets.py

Lines changed: 0 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -13,21 +13,3 @@ def __init__(self, *args, **kwargs):
1313
attrs.setdefault("data-placeholder", "")
1414
kwargs["attrs"] = attrs
1515
super().__init__(*args, **kwargs)
16-
17-
18-
class MetaTermWidget(forms.SelectMultiple):
19-
def create_option(
20-
self, name, value, label, selected, index, subindex=None, attrs=None
21-
):
22-
disabled = False
23-
24-
if isinstance(label, dict):
25-
label, disabled = label.get("label"), label.get("disabled")
26-
27-
option_dict = super().create_option(
28-
name, value, label, selected, index, subindex=subindex, attrs=attrs
29-
)
30-
31-
if disabled:
32-
option_dict["attrs"]["disabled"] = "disabled"
33-
return option_dict

0 commit comments

Comments
 (0)