diff --git a/go/campaigns/urls.py b/go/campaigns/urls.py index 1be65fb96..bc278b3f0 100644 --- a/go/campaigns/urls.py +++ b/go/campaigns/urls.py @@ -6,9 +6,9 @@ url(r'^details/$', views.details, name='details'), url(r'^details/$', views.details, name='details'), url(r'^message/(?P[\w ]+)/$', views.message, name='message'), - url(r'^message/(?P[\w ]+)/bulk/$', views.message_bulk, + url(r'^message/(?P[\w ]+)/bulk/$', views.message_bulk, name='message_bulk'), - url(r'^message/(?P[\w ]+)/conversation/$', + url(r'^message/(?P[\w ]+)/conversation/$', views.message_conversation, name='message_conversation'), # url(r'^recipients/$', views.create, name='create'), diff --git a/go/campaigns/views.py b/go/campaigns/views.py index 2896d332b..4b916cd0e 100644 --- a/go/campaigns/views.py +++ b/go/campaigns/views.py @@ -1,6 +1,4 @@ -from django.http import Http404 from django.shortcuts import render, redirect -from django.core.urlresolvers import reverse from .forms import CampaignGeneralForm, CampaignConfigurationForm @@ -30,27 +28,22 @@ def details(request, key=None): # save and go to next step. return redirect('campaigns:message', campaign_key='fakekeydawg') - return render(request, 'campaigns/wizard_1_details.html', { 'form_general': form_general, 'form_config': form_config }) + def message(request, campaign_key): - return redirect('campaigns:message_bulk', campaign_key=campaign_key) + return redirect('campaigns:message_bulk', campaign_key=campaign_key) def message_bulk(request, campaign_key): return render(request, 'campaigns/wizard_2_message_bulk.html') - - -def message_conversation(request, campaign_key): - - return render(request, 'campaigns/wizard_2_conversation.html') - - +def message_conversation(request, campaign_key): # is this for a conversation or bulk? # determine that and redirect. + return render(request, 'campaigns/wizard_2_conversation.html') diff --git a/go/contacts/views.py b/go/contacts/views.py index 9b76c1ee5..03b32bd03 100644 --- a/go/contacts/views.py +++ b/go/contacts/views.py @@ -382,7 +382,6 @@ def _people(request): else: keys = contact_store.list_contacts() - limit = int(request.GET.get('limit', 100)) if limit: messages.info(request,