Align code, tests, and url templates around the person ajax json views. Fix a dangling pyflake nit. Commit ready for merge.
- Legacy-Id: 19453
This commit is contained in:
parent
f909a1922b
commit
d74c7a8a5a
|
@ -4,8 +4,8 @@ from ietf.utils.urls import url
|
|||
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),
|
||||
]
|
||||
|
|
|
@ -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):
|
||||
|
|
|
@ -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)
|
||||
);
|
||||
|
|
Loading…
Reference in a new issue