Skip to content

Commit d713728

Browse files
committed
Merged in [9595] from rcross@amsl.com:
Fixed an issue where an authorized individual was unable to add an incoming liaison. Fixed a problem with the incoming liaison form requiring a deadline date for information only statements. - Legacy-Id: 9605 Note: SVN reference [9595] has been migrated to Git commit fca04d9
2 parents 8365a36 + fca04d9 commit d713728

3 files changed

Lines changed: 7 additions & 11 deletions

File tree

ietf/liaisons/views.py

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,9 @@
2222

2323
@can_submit_liaison_required
2424
def add_liaison(request, liaison=None):
25+
if 'incoming' in request.GET.keys() and not can_add_incoming_liaison(request.user):
26+
return HttpResponseForbidden("Restricted to users who are authorized to submit incoming liaison statements")
27+
2528
if request.method == 'POST':
2629
form = liaison_form_factory(request, data=request.POST.copy(),
2730
files = request.FILES, liaison=liaison)

ietf/templates/debug.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ <h3>SQL Queries</h3>
99
<p>
1010
{{ sql_queries|length }} queries ({{ sql_queries|timesum }}s)
1111
{% if sql_queries|length != 0 %}
12-
<a class="btn btn-default btn-sm" onclick="document.getElementById('debug-query-table').style.display='';">Show</a>
12+
<a class="btn btn-default btn-sm" onclick="document.getElementById('debug-query-table').style.display='table';">Show</a>
1313
{% endif %}
1414
</p>
1515
<table class="table table-condensed table-striped" id="debug-query-table" style="display: none;">

static/js/liaisons.js

Lines changed: 3 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -238,21 +238,14 @@ $(document).ready(function () {
238238

239239
var selected_id = purpose.val();
240240

241-
if (selected_id == '1' || selected_id == '2' || selected_id == '5') {
241+
if (selected_id == '1' || selected_id == '2') {
242+
deadline.prop('required',true);
242243
deadlinecontainer.show();
243244
} else {
245+
deadline.prop('required',false);
244246
deadlinecontainer.hide();
245247
deadline.val('');
246248
}
247-
248-
if (selected_id == '5') {
249-
othercontainer.show();
250-
deadlinecontainer.find("label").removeClass("required");
251-
} else {
252-
othercontainer.hide();
253-
other_purpose.val('');
254-
deadlinecontainer.find("label").addClass("required");
255-
}
256249
};
257250

258251
var checkOtherSDO = function() {

0 commit comments

Comments
 (0)