Skip to content

fix: avoid readonly attribute on select element #4819

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
rjsparks merged 4 commits into from
Dec 2, 2022
Merged

fix: avoid readonly attribute on select element #4819

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
85998f5
fix: avoid readonly attribute on select element
jennifer-richards Dec 1, 2022
327e308
chore: remove now-unused CSS for select2
jennifer-richards Dec 1, 2022
b530eb7
test: don't ignore `readonly` on `select`
jennifer-richards Dec 1, 2022
3e6eb3f
refactor: simplify OutgoingLiaisonForm base class overrides
jennifer-richards Dec 1, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions ietf/liaisons/forms.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -471,7 +471,6 @@ def set_to_fields(self):


class OutgoingLiaisonForm(LiaisonModelForm):
from_contact = SearchableEmailField(only_users=True)
approved = forms.BooleanField(label="Obtained prior approval", required=False)

class Meta:
Expand Down Expand Up @@ -501,6 +500,7 @@ def set_from_fields(self):
self.fields['from_groups'].initial = [flat_choices[0][0]]

if has_role(self.user, "Secretariat"):
self.fields['from_contact'] = SearchableEmailField(only_users=True) # secretariat can edit this field!
return

if self.person.role_set.filter(name='liaiman',group__state='active'):
Expand All @@ -509,8 +509,10 @@ def set_from_fields(self):
email = self.person.role_set.filter(name__in=('ad','chair'),group__state='active').first().email.address
else:
email = self.person.email_address()

# Non-secretariat user cannot change the from_contact field. Fill in its value.
self.fields['from_contact'].disabled = True
self.fields['from_contact'].initial = email
self.fields['from_contact'].widget.attrs['readonly'] = True

def set_to_fields(self):
'''Set to_groups and to_contacts options and initial value based on user
Expand Down
18 changes: 0 additions & 18 deletions ietf/static/css/select2.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,21 +3,3 @@
@import "bootstrap/scss/mixins";
@import "select2/src/scss/core";
@import "select2-bootstrap-5-theme/src/include-all";

// Propagate readonly property from input to select2 instrumentation, based on
// https://stackoverflow.com/questions/41807096/select2-make-it-readonly-not-disabled-from-js/55001516#55001516
select[readonly].select2-hidden-accessible + .select2-container {
pointer-events: none;
touch-action: none;

.select2-selection {
background: $form-select-disabled-bg;
color: $form-select-disabled-color;
border-color: $form-select-disabled-border-color;
box-shadow: none;
}

.select2-selection__arrow, .select2-selection__clear {
display: none;
}
}
1 change: 0 additions & 1 deletion ietf/utils/test_runner.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -196,7 +196,6 @@ def vnu_filter_message(msg, filter_db_issues, filter_test_issues):

return re.search(
r"""document\ is\ not\ mappable\ to\ XML\ 1|
Attribute\ 'readonly'\ not\ allowed\ on\ element\ 'select'|
^Attribute\ 'required'\ not\ allowed\ on\ element\ 'div'|
^The\ 'type'\ attribute\ is\ unnecessary\ for\ JavaScript|
is\ not\ in\ Unicode\ Normalization\ Form\ C""",
Expand Down