altf4arnold/datatracker
1
0
Fork 0
Code Issues Pull requests Actions 3 Packages Projects Releases Wiki Activity

Merged in [9595] from rcross@amsl.com:

Browse source 
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 fca04d97e5
This commit is contained in:
Henrik Levkowetz 2015-05-06 17:22:13 +00:00
parent 8365a36c2f fca04d97e5
commit d713728072
3 changed files with 7 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
ietf/liaisons/views.py
View file

@ -22,6 +22,9 @@ from ietf.liaisons.fields import select2_id_liaison_json
@can_submit_liaison_required
def add_liaison(request, liaison=None):
if 'incoming' in request.GET.keys() and not can_add_incoming_liaison(request.user):
return HttpResponseForbidden("Restricted to users who are authorized to submit incoming liaison statements")
if request.method == 'POST':
form = liaison_form_factory(request, data=request.POST.copy(),
files = request.FILES, liaison=liaison)

2
ietf/templates/debug.html
View file

@ -9,7 +9,7 @@
<p>
{{ sql_queries|length }} queries ({{ sql_queries|timesum }}s)
{% if sql_queries|length != 0 %}
<a class="btn btn-default btn-sm" onclick="document.getElementById('debug-query-table').style.display='';">Show</a>
<a class="btn btn-default btn-sm" onclick="document.getElementById('debug-query-table').style.display='table';">Show</a>
{% endif %}
</p>
<table class="table table-condensed table-striped" id="debug-query-table" style="display: none;">

13
static/js/liaisons.js
View file

@ -238,21 +238,14 @@ $(document).ready(function () {
var selected_id = purpose.val();
if (selected_id == '1' || selected_id == '2' || selected_id == '5') {
if (selected_id == '1' || selected_id == '2') {
deadline.prop('required',true);
deadlinecontainer.show();
} else {
deadline.prop('required',false);
deadlinecontainer.hide();
deadline.val('');
}
if (selected_id == '5') {
othercontainer.show();
deadlinecontainer.find("label").removeClass("required");
} else {
othercontainer.hide();
other_purpose.val('');
deadlinecontainer.find("label").addClass("required");
}
};
var checkOtherSDO = function() {