From d74c7a8a5af9f736a4168d59eb7c22913c32aa96 Mon Sep 17 00:00:00 2001 From: Robert Sparks Date: Mon, 25 Oct 2021 15:29:10 +0000 Subject: [PATCH] Align code, tests, and url templates around the person ajax json views. Fix a dangling pyflake nit. Commit ready for merge. - Legacy-Id: 19453 --- ietf/person/urls.py | 4 ++-- ietf/person/utils.py | 1 - ietf/templates/doc/edit_authors.html | 4 ++-- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/ietf/person/urls.py b/ietf/person/urls.py index ffcda989d..68b6acd8d 100644 --- a/ietf/person/urls.py +++ b/ietf/person/urls.py @@ -4,8 +4,8 @@ from ietf.utils.urls import url urlpatterns = [ url(r'^merge/$', views.merge), url(r'^search/(?P(person|email))/$', views.ajax_select2_search), - url(r'^(?P[a-z0-9]+).json$', ajax.person_json), - url(r'^(?P[a-z0-9]+)/email.json$', ajax.person_email_json), + url(r'^(?P[0-9]+).json$', ajax.person_json), + url(r'^(?P[0-9]+)/email.json$', ajax.person_email_json), url(r'^(?P[^/]+)$', views.profile), url(r'^(?P[^/]+)/photo/?$', views.photo), ] diff --git a/ietf/person/utils.py b/ietf/person/utils.py index 4040149fa..a3c632b8c 100755 --- a/ietf/person/utils.py +++ b/ietf/person/utils.py @@ -15,7 +15,6 @@ from django.core.exceptions import ObjectDoesNotExist import debug # pyflakes:ignore from ietf.person.models import Person -from ietf.group.models import GroupFeatures from ietf.utils.mail import send_mail def merge_persons(request, source, target, file=sys.stdout, verbose=False): diff --git a/ietf/templates/doc/edit_authors.html b/ietf/templates/doc/edit_authors.html index 57d230435..2783fdcc2 100644 --- a/ietf/templates/doc/edit_authors.html +++ b/ietf/templates/doc/edit_authors.html @@ -78,7 +78,7 @@ var list_container; var form_counter; 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"]'; function handle_drag_end() { @@ -126,7 +126,7 @@ var person_elt = $(this); var email_select = $('#' + person_elt.attr('id').replace(/-person$/, '-email')); $.get( - ajax_url.replace('0000placeholder0000', $(this).val()), + ajax_url.replace('123454321', $(this).val()), null, update_email_options_cb_factory(email_select) );