Skip to content

Commit

Permalink
Align code, tests, and url templates around the person ajax json view…
Browse files Browse the repository at this point in the history
…s. Fix a dangling pyflake nit. Commit ready for merge.

 - Legacy-Id: 19453
  • Loading branch information
rjsparks committed Oct 25, 2021
1 parent f909a19 commit d74c7a8
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 5 deletions.
4 changes: 2 additions & 2 deletions ietf/person/urls.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@
urlpatterns = [
url(r'^merge/$', views.merge),
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>[a-z0-9]+)/email.json$', ajax.person_email_json),
url(r'^(?P<personid>[0-9]+).json$', ajax.person_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>[^/]+)/photo/?$', views.photo),
]
1 change: 0 additions & 1 deletion ietf/person/utils.py
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@
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):
Expand Down
4 changes: 2 additions & 2 deletions ietf/templates/doc/edit_authors.html
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ <h1>Edit authors<br><small>{{ titletext }}</small></h1>
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() {
Expand Down Expand Up @@ -126,7 +126,7 @@ <h1>Edit authors<br><small>{{ titletext }}</small></h1>
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)
);
Expand Down

0 comments on commit d74c7a8

Please sign in to comment.