Hopefully fix #3556.

- Legacy-Id: 19978
This commit is contained in:
Lars Eggert 2022-02-24 09:11:32 +00:00
parent 37cb737987
commit ca167c0172
3 changed files with 11 additions and 11 deletions

View file

@ -105,6 +105,8 @@ class InterimSessionInlineFormSet(BaseInlineFormSet):
class InterimMeetingModelForm(forms.ModelForm):
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")
group.widget.attrs['data-max-entries'] = 1
group.widget.attrs['data-minimum-input-length'] = 0
in_person = forms.BooleanField(required=False)
meeting_type = forms.ChoiceField(choices=(
("single", "Single"),
@ -120,7 +122,14 @@ class InterimMeetingModelForm(forms.ModelForm):
city = forms.CharField(max_length=255, required=False)
city.widget.attrs['placeholder'] = "City"
country = forms.ChoiceField(choices=countries, required=False)
country.widget.attrs['class'] = "select2-field"
country.widget.attrs['data-max-entries'] = 1
country.widget.attrs['data-placeholder'] = "Country"
country.widget.attrs['data-minimum-input-length'] = 0
time_zone = forms.ChoiceField(choices=timezones)
time_zone.widget.attrs['class'] = "select2-field"
time_zone.widget.attrs['data-max-entries'] = 1
time_zone.widget.attrs['data-minimum-input-length'] = 0
class Meta:
model = Meeting

View file

@ -6,9 +6,6 @@ var interimRequest = {
interimRequest.addButton = $('#add_session');
interimRequest.inPerson = $('#id_in_person');
interimRequest.timezone = $('#id_time_zone');
// bind functions
$('.select2-field')
.select2();
interimRequest.addButton.on("click", interimRequest.addSession);
$('.btn-delete')
.on("click", interimRequest.deleteSession);
@ -33,8 +30,6 @@ var interimRequest = {
.each(interimRequest.calculateEndTime);
$('input[name$="-time"]')
.each(interimRequest.updateInfo);
$('#id_country')
.select2({ placeholder: "Country" });
},
addSession: function () {
@ -81,11 +76,6 @@ var interimRequest = {
template.before(el);
el.removeClass("template visually-hidden");
el.find(".select2-field")
.each(function () {
setupSelect2Field($(this));
});
// copy field contents
var first_session = $(".fieldset:first");
el.find("input[name$='remote_instructions']")
@ -265,7 +255,7 @@ var interimRequest = {
.prop('disabled', true);
}
}
}
};
$(document)
.ready(function () {

View file

@ -7,6 +7,7 @@ $.fn.select2.defaults.set("allowClear", true);
$.fn.select2.defaults.set("debug", false);
$.fn.select2.defaults.set("dropdownCssClass", ":all:");
$.fn.select2.defaults.set("minimumInputLength", 2);
$.fn.select2.defaults.set("placeholder", "");
$.fn.select2.defaults.set("selectionCssClass", ":all:");
$.fn.select2.defaults.set("theme", "bootstrap-5");
$.fn.select2.defaults.set("width", "off");