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

Merged in [19453] from rjsparks@nostrum.com:

Browse source 
Align code, tests, and url templates around the person ajax json views. Fix a dangling pyflake nit.
 - Legacy-Id: 19500
Note: SVN reference [19453] has been migrated to Git commit d74c7a8a5a
This commit is contained in:
Robert Sparks 2021-10-29 18:33:12 +00:00
parent 86e1f63b9a d74c7a8a5a
commit 73d352dfd6
3 changed files with 4 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
ietf/person/urls.py
View file

@ -4,8 +4,8 @@ from ietf.utils.urls import url
urlpatterns = [ urlpatterns = [
url(r'^merge/$', views.merge), url(r'^merge/$', views.merge),
url(r'^search/(?P<model_name>(person|email))/$', views.ajax_select2_search), url(r'^search/(?P<model_name>(person|email))/$', views.ajax_select2_search),
url(r'^(?P<personid>[a-z0-9]+).json$', ajax.person_json), url(r'^(?P<personid>[0-9]+).json$', ajax.person_json),
url(r'^(?P<personid>[a-z0-9]+)/email.json$', ajax.person_email_json), url(r'^(?P<personid>[0-9]+)/email.json$', ajax.person_email_json),
url(r'^(?P<email_or_name>[^/]+)$', views.profile), url(r'^(?P<email_or_name>[^/]+)$', views.profile),
url(r'^(?P<email_or_name>[^/]+)/photo/?$', views.photo), url(r'^(?P<email_or_name>[^/]+)/photo/?$', views.photo),
] ]

1
ietf/person/utils.py
View file

@ -15,7 +15,6 @@ from django.core.exceptions import ObjectDoesNotExist
import debug # pyflakes:ignore import debug # pyflakes:ignore
from ietf.person.models import Person from ietf.person.models import Person
from ietf.group.models import GroupFeatures
from ietf.utils.mail import send_mail from ietf.utils.mail import send_mail
def merge_persons(request, source, target, file=sys.stdout, verbose=False): def merge_persons(request, source, target, file=sys.stdout, verbose=False):

4
ietf/templates/doc/edit_authors.html
View file

@ -78,7 +78,7 @@
var list_container; var list_container;
var form_counter; var form_counter;
var author_template; var author_template;
var ajax_url = '{% url "ietf.person.ajax.person_email_json" personid="0000placeholder0000" %}'; var ajax_url = '{% url "ietf.person.ajax.person_email_json" personid="123454321" %}';
var person_select2_input_selector = 'input.select2-field[name^="author-"][name$="-person"]'; var person_select2_input_selector = 'input.select2-field[name^="author-"][name$="-person"]';
function handle_drag_end() { function handle_drag_end() {
@ -126,7 +126,7 @@
var person_elt = $(this); var person_elt = $(this);
var email_select = $('#' + person_elt.attr('id').replace(/-person$/, '-email')); var email_select = $('#' + person_elt.attr('id').replace(/-person$/, '-email'));
$.get( $.get(
ajax_url.replace('0000placeholder0000', $(this).val()), ajax_url.replace('123454321', $(this).val()),
null, null,
update_email_options_cb_factory(email_select) update_email_options_cb_factory(email_select)
); );