Skip to content
This repository has been archived by the owner on Jun 12, 2018. It is now read-only.

Commit

Permalink
pep8 fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
justinvdm committed May 3, 2013
1 parent f1e859b commit e9a7340
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 14 deletions.
4 changes: 2 additions & 2 deletions go/campaigns/urls.py
Expand Up @@ -6,9 +6,9 @@
url(r'^details/$', views.details, name='details'),
url(r'^details/$', views.details, name='details'),
url(r'^message/(?P<campaign_key>[\w ]+)/$', views.message, name='message'),
url(r'^message/(?P<campaign_key>[\w ]+)/bulk/$', views.message_bulk,
url(r'^message/(?P<campaign_key>[\w ]+)/bulk/$', views.message_bulk,
name='message_bulk'),
url(r'^message/(?P<campaign_key>[\w ]+)/conversation/$',
url(r'^message/(?P<campaign_key>[\w ]+)/conversation/$',
views.message_conversation, name='message_conversation'),

# url(r'^recipients/$', views.create, name='create'),
Expand Down
15 changes: 4 additions & 11 deletions 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
Expand Down Expand Up @@ -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')
1 change: 0 additions & 1 deletion go/contacts/views.py
Expand Up @@ -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,
Expand Down

0 comments on commit e9a7340

Please sign in to comment.