Skip to content

Commit 37cb737

Browse files
larseggertlarseggert
committed
Check the selenium console log for any issues as part of the test suite,
and fix/suppress errors found by that. - Legacy-Id: 19916
1 parent 1795609 commit 37cb737

13 files changed

Lines changed: 1033 additions & 6859 deletions

‎ietf/static/js/agenda_filter.js‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -261,7 +261,6 @@ window.agenda_filter_for_testing; // methods to be accessed for automated testin
261261
function register_handlers() {
262262
$('.pickview')
263263
.on("click", function () {
264-
console.log("pickview");
265264
if (is_disabled($(this))) { return; }
266265
var fp = handle_pick_button($(this));
267266
update_filters(fp);

‎ietf/static/js/datepicker.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
import "bootstrap-datepicker";
1+
import "bootstrap-datepicker/js/bootstrap-datepicker.js";

‎ietf/static/js/edit-meeting-schedule.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -497,7 +497,7 @@ jQuery(document).ready(function () {
497497
let originRadio = updateSwapRadios(swapDaysLabels, swapDaysRadios, originDay, 'day');
498498

499499
// Fill in label in the modal title
500-
swapDaysModal.find(".modal-title .day").text(jQuery.trim(originRadio.parent().text()));
500+
swapDaysModal.find(".modal-title .day").text(originRadio.parent().text().trim());
501501

502502
// Fill in the hidden form fields
503503
swapDaysModal.find("input[name=source_day]").val(originDay);

‎ietf/static/js/select2.js‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ $.fn.select2.defaults.set("escapeMarkup", function (m) {
1919
window.setupSelect2Field = function (e) {
2020
var url = e.data("ajax--url");
2121
var maxEntries = e.data("max-entries");
22+
var result_key = e.data("result-key");
2223
var options = e.data("pre");
2324
for (var id in options) {
2425
e.append(new Option(options[id].text, options[id].id, false, options[id].selected));
@@ -38,6 +39,10 @@ window.setupSelect2Field = function (e) {
3839
};
3940
},
4041
processResults: function (results) {
42+
if (result_key) {
43+
// overwrite the returned "id" fields with the data in the result_key fields
44+
results = results.map(x => ({ ...x, ...{ id: x[result_key] } }));
45+
}
4146
return {
4247
results: results,
4348
pagination: {

‎ietf/static/js/status-change-edit-relations.js‎

Lines changed: 30 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -1,31 +1,32 @@
1-
$(function () {
2-
var form = $(".new-relation-row")
3-
.closest("form");
4-
var newRowHtml = form.find(".new-relation-row")
5-
.get(0)
6-
.outerHTML;
7-
var counter = 1;
1+
$(document)
2+
.ready(function () {
3+
var form = $(".new-relation-row")
4+
.closest("form");
5+
var newRowHtml = form.find(".new-relation-row")
6+
.get(0)
7+
.outerHTML;
8+
var counter = 1;
89

9-
form.on("click", ".delete", function (e) {
10-
e.preventDefault();
11-
$(this)
12-
.closest(".input-group")
13-
.remove();
14-
});
10+
form.on("click", ".delete", function (e) {
11+
e.preventDefault();
12+
$(this)
13+
.closest(".input-group")
14+
.remove();
15+
});
1516

16-
form.on("keydown", ".new-relation-row input[type=text]", function () {
17-
var top = $(this)
18-
.closest(".new-relation-row");
19-
top.removeClass("new-relation-row");
20-
top.find(".delete")
21-
.removeAttr('Disabled')
22-
.removeClass("btn-outline-danger")
23-
.addClass("btn-danger");
24-
top.find("input,select")
25-
.each(function () {
26-
this.name += counter;
27-
});
28-
++counter;
29-
top.after(newRowHtml);
30-
});
31-
});
17+
form.on("keydown", ".new-relation-row input[type=text]", function () {
18+
var top = $(this)
19+
.closest(".new-relation-row");
20+
top.removeClass("new-relation-row");
21+
top.find(".delete")
22+
.prop('Disabled', false)
23+
.removeClass("btn-outline-danger")
24+
.addClass("btn-danger");
25+
top.find("input,select")
26+
.each(function () {
27+
this.name += counter;
28+
});
29+
++counter;
30+
top.after(newRowHtml);
31+
});
32+
});

‎ietf/static/js/timeslot_edit.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -213,7 +213,7 @@ timeslotEdit = (function () {
213213

214214
let timeslotElts = Array.from(deleteModal.eltsToDelete); // make own copy as Array so we have .map()
215215
ajaxDeleteTimeSlot(timeslotElts.map(elt => elt.dataset.timeslotPk))
216-
.error(function (jqXHR) {
216+
.fail(function (jqXHR) {
217217
displayError('Error deleting timeslot: ' + jqXHR.responseText);
218218
})
219219
.done(function () {

‎ietf/templates/doc/document_history.html‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ <h2 class="my-3">Revision differences</h2>
2525
<div class="row mb-3">
2626
<label for="url1" class="col-form-label col-sm-2 fw-bold">From revision</label>
2727
<div class="col-sm-10">
28-
<select class="form-select" id="url1" name="url1">
28+
<select class="form-select select2-field" data-max-entries="1" data-minimum-input-length="0" id="url1" name="url1">
2929
{% for name, rev, time, url in diff_revisions %}
3030
<option value="{{ url }}"
3131
{% if diff_revisions|length > 1 and forloop.counter == 2 %} selected="selected"{% endif %}>
@@ -46,7 +46,7 @@ <h2 class="my-3">Revision differences</h2>
4646
<div class="row mb-3">
4747
<label for="url2" class="col-form-label col-sm-2 fw-bold">To revision</label>
4848
<div class="col-sm-10">
49-
<select class="form-select" id="url2" name="url2">
49+
<select class="form-select select2-field" data-max-entries="1" data-minimum-input-length="0" id="url2" name="url2">
5050
{% for name, rev, time, url in diff_revisions %}
5151
<option value="{{ url }}"
5252
{% if forloop.counter == 1 %} selected="selected"{% endif %}>

‎ietf/templates/doc/status_change/edit_related_rows.html‎

Lines changed: 19 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,17 @@
33
{% origin %}
44
{% for rfc,choice_slug in form.relations.items %}
55
<div class="input-group mb-3">
6-
<input class="form-control"
7-
name="new_relation_row_{{ rfc }}"
8-
type="text"
9-
value="{{ rfc }}">
6+
<select class="form-control select2-field"
7+
data-ajax--url="{% url 'ietf.doc.views_search.ajax_select2_search_docs' model_name='document' doc_type='draft' %}"
8+
data-max-entries="1"
9+
data-width="resolve"
10+
data-result-key="text"
11+
name="new_relation_row_{{ rfc }}"
12+
data-placeholder="Enter new affected RFC.">
13+
<option id="{{ rfc|upper }}" selected>
14+
{{ rfc|upper }}
15+
</option>
16+
</select>
1017
<select class="form-select" name="statchg_relation_row_{{ rfc }}">
1118
<option value="" {% if choice_slug == "" %}selected{% endif %}>
1219
(None)
@@ -22,10 +29,14 @@
2229
</div>
2330
{% endfor %}
2431
<div class="input-group mb-3 new-relation-row">
25-
<input name="new_relation_row_"
26-
type="text"
27-
class="form-control"
28-
placeholder="Enter new affected RFC.">
32+
<select name="new_relation_row_"
33+
class="form-control select2-field"
34+
data-ajax--url="{% url 'ietf.doc.views_search.ajax_select2_search_docs' model_name='document' doc_type='draft' %}"
35+
data-result-key="text"
36+
data-max-entries="1"
37+
data-width="resolve"
38+
data-placeholder="Enter new affected RFC.">
39+
</select>
2940
<select class="form-select" name="statchg_relation_row_">
3041
<option value="" {% if choice_slug == "" %}selected{% endif %}>
3142
(Select proposed new status.)

‎ietf/templates/meeting/agenda.html‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -369,9 +369,9 @@ <h2 class="mt-3">
369369
if (!weekview.hasClass('visually-hidden')) {
370370
var queryparams = window.location.search;
371371
if (queryparams) {
372-
queryparams += '&tz=' + ietf_timezone.get_current_tz().toLowerCase();
372+
queryparams += '&tz=' + encodeURI(ietf_timezone.get_current_tz().toLowerCase());
373373
} else {
374-
queryparams = '?tz=' + ietf_timezone.get_current_tz().toLowerCase();
374+
queryparams = '?tz=' + encodeURI(ietf_timezone.get_current_tz().toLowerCase());
375375
}
376376
var new_url = 'week-view.html' + queryparams;
377377
var wv_iframe = $(weekview).children('iframe');

‎ietf/templates/submit/search_submission.html‎

Lines changed: 12 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,18 @@
1313
{% csrf_token %}
1414
<div class="mb-3">
1515
<label class="form-label">I-D name</label>
16-
<input type="text"
17-
class="form-control"
18-
placeholder="draft-..."
19-
name="name"
20-
value="{{ name|default:"" }}">
16+
<select class="form-control select2-field"
17+
data-placeholder="draft-..."
18+
data-ajax--url="{% url 'ietf.doc.views_search.ajax_select2_search_docs' model_name='document' doc_type='draft' %}"
19+
data-max-entries="1"
20+
data-result-key="text"
21+
name="name">
22+
{% if name %}
23+
<option id="{{ name }}" selected>
24+
{{ name }}
25+
</option>
26+
{% endif %}
27+
</select>
2128
</div>
2229
{% if error %}
2330
<p class="alert alert-danger my-3">

0 commit comments

Comments
 (0)