Skip to content

Commit ca167c0

Browse files
committed
Hopefully fix ietf-tools#3556.
- Legacy-Id: 19978
1 parent 37cb737 commit ca167c0

3 files changed

Lines changed: 11 additions & 11 deletions

File tree

ietf/meeting/forms.py

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -105,6 +105,8 @@ def clean(self):
105105

106106
class InterimMeetingModelForm(forms.ModelForm):
107107
group = GroupModelChoiceField(queryset=Group.objects.filter(type_id__in=GroupFeatures.objects.filter(has_meetings=True).values_list('type_id',flat=True), state__in=('active', 'proposed', 'bof')).order_by('acronym'), required=False, empty_label="Click to select")
108+
group.widget.attrs['data-max-entries'] = 1
109+
group.widget.attrs['data-minimum-input-length'] = 0
108110
in_person = forms.BooleanField(required=False)
109111
meeting_type = forms.ChoiceField(choices=(
110112
("single", "Single"),
@@ -120,7 +122,14 @@ class InterimMeetingModelForm(forms.ModelForm):
120122
city = forms.CharField(max_length=255, required=False)
121123
city.widget.attrs['placeholder'] = "City"
122124
country = forms.ChoiceField(choices=countries, required=False)
125+
country.widget.attrs['class'] = "select2-field"
126+
country.widget.attrs['data-max-entries'] = 1
127+
country.widget.attrs['data-placeholder'] = "Country"
128+
country.widget.attrs['data-minimum-input-length'] = 0
123129
time_zone = forms.ChoiceField(choices=timezones)
130+
time_zone.widget.attrs['class'] = "select2-field"
131+
time_zone.widget.attrs['data-max-entries'] = 1
132+
time_zone.widget.attrs['data-minimum-input-length'] = 0
124133

125134
class Meta:
126135
model = Meeting

ietf/static/js/meeting-interim-request.js

Lines changed: 1 addition & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,6 @@ var interimRequest = {
66
interimRequest.addButton = $('#add_session');
77
interimRequest.inPerson = $('#id_in_person');
88
interimRequest.timezone = $('#id_time_zone');
9-
// bind functions
10-
$('.select2-field')
11-
.select2();
129
interimRequest.addButton.on("click", interimRequest.addSession);
1310
$('.btn-delete')
1411
.on("click", interimRequest.deleteSession);
@@ -33,8 +30,6 @@ var interimRequest = {
3330
.each(interimRequest.calculateEndTime);
3431
$('input[name$="-time"]')
3532
.each(interimRequest.updateInfo);
36-
$('#id_country')
37-
.select2({ placeholder: "Country" });
3833
},
3934

4035
addSession: function () {
@@ -81,11 +76,6 @@ var interimRequest = {
8176
template.before(el);
8277
el.removeClass("template visually-hidden");
8378

84-
el.find(".select2-field")
85-
.each(function () {
86-
setupSelect2Field($(this));
87-
});
88-
8979
// copy field contents
9080
var first_session = $(".fieldset:first");
9181
el.find("input[name$='remote_instructions']")
@@ -265,7 +255,7 @@ var interimRequest = {
265255
.prop('disabled', true);
266256
}
267257
}
268-
}
258+
};
269259

270260
$(document)
271261
.ready(function () {

ietf/static/js/select2.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ $.fn.select2.defaults.set("allowClear", true);
77
$.fn.select2.defaults.set("debug", false);
88
$.fn.select2.defaults.set("dropdownCssClass", ":all:");
99
$.fn.select2.defaults.set("minimumInputLength", 2);
10+
$.fn.select2.defaults.set("placeholder", "");
1011
$.fn.select2.defaults.set("selectionCssClass", ":all:");
1112
$.fn.select2.defaults.set("theme", "bootstrap-5");
1213
$.fn.select2.defaults.set("width", "off");

0 commit comments

Comments
 (0)