diff --git a/cfp/models.py b/cfp/models.py index e92d3c4..2b523c6 100644 --- a/cfp/models.py +++ b/cfp/models.py @@ -470,7 +470,7 @@ class Volunteer(PonyConfModel): return reverse('volunteer-details', kwargs=dict(volunteer_id=self.pk)) def get_secret_url(self, full=False): - url = reverse('volunteer-home', kwargs=dict(volunteer_token=self.token)) + url = reverse('volunteer-dashboard', kwargs=dict(volunteer_token=self.token)) if full: url = ('https' if self.site.conference.secure_domain else 'http') + '://' + self.site.domain + url return url diff --git a/cfp/tests.py b/cfp/tests.py index 730d964..2d13329 100644 --- a/cfp/tests.py +++ b/cfp/tests.py @@ -51,12 +51,12 @@ class VolunteersTests(TestCase): response = self.client.post(reverse('volunteer-enrole'), {'name': 'B', 'email': 'b@example.org'}) self.assertEqual(Volunteer.objects.count(), n+1) v = Volunteer.objects.get(name='B') - self.assertRedirects(response, reverse('volunteer-home', kwargs=dict(volunteer_token=v.token)), + self.assertRedirects(response, reverse('volunteer-dashboard', kwargs=dict(volunteer_token=v.token)), status_code=302, target_status_code=200) def test_enrole_logged_in(self): self.client.login(username='a', password='a') - self.assertRedirects(self.client.get(reverse('volunteer-enrole')), reverse('volunteer-home')) + self.assertRedirects(self.client.get(reverse('volunteer-enrole')), reverse('volunteer-dashboard')) self.client.login(username='b', password='b') self.assertEqual(self.client.get(reverse('volunteer-enrole')).status_code, 403) conf = Conference.objects.first() @@ -76,13 +76,13 @@ class VolunteersTests(TestCase): response = self.client.post(reverse('volunteer-enrole'), {'name': 'B'}) self.assertEqual(Volunteer.objects.count(), n+1) v = Volunteer.objects.get(name='B') - self.assertRedirects(response, reverse('volunteer-home', kwargs=dict(volunteer_token=v.token)), + self.assertRedirects(response, reverse('volunteer-dashboard', kwargs=dict(volunteer_token=v.token)), status_code=302, target_status_code=200) - self.assertRedirects(self.client.get(reverse('volunteer-enrole')), reverse('volunteer-home')) + self.assertRedirects(self.client.get(reverse('volunteer-enrole')), reverse('volunteer-dashboard')) def test_home(self): v = Volunteer.objects.get(name='A') - self.assertEqual(self.client.get(reverse('volunteer-home', kwargs=dict(volunteer_token=v.token))).status_code, 200) + self.assertEqual(self.client.get(reverse('volunteer-dashboard', kwargs=dict(volunteer_token=v.token))).status_code, 200) def test_update_activity(self): v = Volunteer.objects.get(name='A') @@ -92,9 +92,9 @@ class VolunteersTests(TestCase): conf.volunteers_opening_date = timezone.now() - timedelta(hours=1) conf.save() self.assertRedirects(self.client.get(reverse('volunteer-join', kwargs=dict(volunteer_token=v.token, activity=a.slug))), - reverse('volunteer-home', kwargs=dict(volunteer_token=v.token)), status_code=302, target_status_code=200) + reverse('volunteer-dashboard', kwargs=dict(volunteer_token=v.token)), status_code=302, target_status_code=200) self.assertRedirects(self.client.get(reverse('volunteer-quit', kwargs=dict(volunteer_token=v.token, activity=a.slug))), - reverse('volunteer-home', kwargs=dict(volunteer_token=v.token)), status_code=302, target_status_code=200) + reverse('volunteer-dashboard', kwargs=dict(volunteer_token=v.token)), status_code=302, target_status_code=200) def test_volunteer_mail_token(self): v = Volunteer.objects.get(name='A') diff --git a/cfp/urls.py b/cfp/urls.py index 0c10cab..49cade1 100644 --- a/cfp/urls.py +++ b/cfp/urls.py @@ -29,7 +29,7 @@ urlpatterns = [ # End backward compatibility url(r'^volunteer/enrole/$', views.volunteer_enrole, name='volunteer-enrole'), url(r'^volunteer/token/$', views.volunteer_mail_token, name='volunteer-mail-token'), - url(r'^volunteer/(?:(?P[\w\-]+)/)?$', views.volunteer_home, name='volunteer-home'), + url(r'^volunteer/(?:(?P[\w\-]+)/)?$', views.volunteer_dashboard, name='volunteer-dashboard'), url(r'^volunteer/(?:(?P[\w\-]+)/)?join/(?P[\w\-]+)/$', views.volunteer_update_activity, {'join': True}, name='volunteer-join'), url(r'^volunteer/(?:(?P[\w\-]+)/)?quit/(?P[\w\-]+)/$', views.volunteer_update_activity, {'join': False}, name='volunteer-quit'), #url(r'^talk/(?P[\w\-]+)/$', views.talk_show, name='show-talk'), diff --git a/cfp/views.py b/cfp/views.py index 981c875..0a9b5b3 100644 --- a/cfp/views.py +++ b/cfp/views.py @@ -44,7 +44,7 @@ def home(request): def volunteer_enrole(request): if request.user.is_authenticated() and Volunteer.objects.filter(site=request.conference.site, email=request.user.email).exists(): - return redirect(reverse('volunteer-home')) + return redirect(reverse('volunteer-dashboard')) if not request.conference.volunteers_enrollment_is_open(): raise PermissionDenied initial = {} @@ -89,7 +89,7 @@ Thanks! recipient_list=['%s <%s>' % (volunteer.name, volunteer.email)], ) messages.success(request, _('Thank you for your participation! You can now subscribe to some activities.')) - return redirect(reverse('volunteer-home', kwargs=dict(volunteer_token=volunteer.token))) + return redirect(reverse('volunteer-dashboard', kwargs=dict(volunteer_token=volunteer.token))) return render(request, 'cfp/volunteer_enrole.html', { 'activities': Activity.objects.filter(site=request.conference.site), 'form': form, @@ -106,7 +106,7 @@ def volunteer_mail_token(request): else: base_url = ('https' if request.is_secure() else 'http') + '://' + request.conference.site.domain - url = base_url + reverse('volunteer-home', kwargs=dict(volunteer_token=volunteer.token)) + url = base_url + reverse('volunteer-dashboard', kwargs=dict(volunteer_token=volunteer.token)) body = render_to_string('cfp/mails/volunteer_send_token.txt', { 'volunteer': volunteer, 'url': url, @@ -132,7 +132,7 @@ def volunteer_mail_token(request): @volunteer_required -def volunteer_home(request, volunteer): +def volunteer_dashboard(request, volunteer): return render(request, 'cfp/volunteer.html', { 'activities': Activity.objects.filter(site=request.conference.site), 'volunteer': volunteer, @@ -150,7 +150,7 @@ def volunteer_update_activity(request, volunteer, activity, join): activity.volunteers.remove(volunteer) activity.save() messages.success(request, _('Okay, no problem!')) - return redirect(reverse('volunteer-home', kwargs=dict(volunteer_token=volunteer.token))) + return redirect(reverse('volunteer-dashboard', kwargs=dict(volunteer_token=volunteer.token))) @staff_required