Skip to content

Commit adee827

Browse files
committed
Fix issue with interim meeting timezone getting reset on edit. Fixes ietf-tools#2204. Commit ready for merge.
- Legacy-Id: 13018
1 parent 4f5933a commit adee827

1 file changed

Lines changed: 16 additions & 2 deletions

File tree

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

Lines changed: 16 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ var interimRequest = {
2222
interimRequest.inPerson.each(interimRequest.toggleLocation);
2323
interimRequest.checkAddButton();
2424
interimRequest.checkHelpText();
25-
interimRequest.checkTimezone();
25+
interimRequest.initTimezone();
2626
$('input[name$="-time"]').each(interimRequest.calculateEndTime);
2727
$('input[name$="-time"]').each(interimRequest.updateInfo);
2828
$('#id_country').select2({placeholder:"Country"});
@@ -152,7 +152,12 @@ var interimRequest = {
152152
}
153153
},
154154

155-
checkTimezone : function() {
155+
initTimezone : function() {
156+
if (interimRequest.isEditView()) {
157+
// Don't set timezone in edit view, already set
158+
return true;
159+
}
160+
156161
if(window.Intl && typeof window.Intl === "object"){
157162
var tzname = Intl.DateTimeFormat().resolvedOptions().timeZone;
158163
if($('#id_time_zone option[value="'+tzname+'"]').length > 0){
@@ -187,6 +192,15 @@ var interimRequest = {
187192
return interimRequest.pad(hours) + ":" + interimRequest.pad(minutes);
188193
},
189194

195+
isEditView : function() {
196+
// Called on init, returns true if editing existing meeting request
197+
if ($('#id_session_set-0-date').val()) {
198+
return true;
199+
} else {
200+
return false;
201+
}
202+
},
203+
190204
meetingTypeChanged : function () {
191205
interimRequest.checkAddButton();
192206
interimRequest.checkInPerson();

0 commit comments

Comments
 (0)