del → remove for consistency
This commit is contained in:
parent
0c8b52aea7
commit
9d9ab225a1
|
@ -44,7 +44,7 @@ urlpatterns = [
|
||||||
url(r'^staff/talks/(?P<talk_id>[\w\-]+)/desist/$', views.talk_acknowledgment, {'confirm': False}, name='talk-desist-by-staff'),
|
url(r'^staff/talks/(?P<talk_id>[\w\-]+)/desist/$', views.talk_acknowledgment, {'confirm': False}, name='talk-desist-by-staff'),
|
||||||
url(r'^staff/talks/(?P<talk_id>[\w\-]+)/edit/$', views.TalkUpdate.as_view(), name='talk-edit'),
|
url(r'^staff/talks/(?P<talk_id>[\w\-]+)/edit/$', views.TalkUpdate.as_view(), name='talk-edit'),
|
||||||
# url(r'^staff/talks/(?P<talk_id>[\w\-]+)/speaker/add/$', views.talk_speaker_add, name='talk-speaker-add'), TODO WIP
|
# url(r'^staff/talks/(?P<talk_id>[\w\-]+)/speaker/add/$', views.talk_speaker_add, name='talk-speaker-add'), TODO WIP
|
||||||
url(r'^staff/talks/(?P<talk_id>[\w\-]+)/speaker/del/(?P<participant_id>[\w\-]+)/$', views.talk_speaker_del, name='talk-speaker-remove'),
|
url(r'^staff/talks/(?P<talk_id>[\w\-]+)/speaker/remove/(?P<participant_id>[\w\-]+)/$', views.talk_speaker_remove, name='talk-speaker-remove'),
|
||||||
url(r'^staff/speakers/$', views.participant_list, name='participant-list'),
|
url(r'^staff/speakers/$', views.participant_list, name='participant-list'),
|
||||||
url(r'^staff/speakers/add/$', views.ParticipantCreate.as_view(), name='participant-add'),
|
url(r'^staff/speakers/add/$', views.ParticipantCreate.as_view(), name='participant-add'),
|
||||||
url(r'^staff/speakers/(?P<participant_id>[\w\-]+)/$', views.participant_details, name='participant-details'),
|
url(r'^staff/speakers/(?P<participant_id>[\w\-]+)/$', views.participant_details, name='participant-details'),
|
||||||
|
|
|
@ -741,7 +741,7 @@ def talk_decide(request, talk_id, accept):
|
||||||
|
|
||||||
|
|
||||||
@staff_required
|
@staff_required
|
||||||
def talk_speaker_del(request, talk_id, participant_id):
|
def talk_speaker_remove(request, talk_id, participant_id):
|
||||||
talk = get_object_or_404(Talk, pk=talk_id, site=request.conference.site)
|
talk = get_object_or_404(Talk, pk=talk_id, site=request.conference.site)
|
||||||
participant = get_object_or_404(Participant, pk=participant_id, site=request.conference.site)
|
participant = get_object_or_404(Participant, pk=participant_id, site=request.conference.site)
|
||||||
talk.speakers.remove(participant)
|
talk.speakers.remove(participant)
|
||||||
|
|
Loading…
Reference in New Issue