Skip to content

Refactor ProjectRedirects views #6187

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Oct 2, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 6 additions & 2 deletions readthedocs/projects/urls/private.py
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,8 @@
ProjectAdvertisingUpdate,
ProjectDashboard,
ProjectDelete,
ProjectRedirects,
ProjectRedirectsDelete,
ProjectUpdate,
)

Expand Down Expand Up @@ -99,12 +101,14 @@
name='projects_translations_delete',
),
url(
r'^(?P<project_slug>[-\w]+)/redirects/$', private.project_redirects,
r'^(?P<project_slug>[-\w]+)/redirects/$',
ProjectRedirects.as_view(),
name='projects_redirects',
),
url(
r'^(?P<project_slug>[-\w]+)/redirects/delete/$',
private.project_redirects_delete, name='projects_redirects_delete',
ProjectRedirectsDelete.as_view(),
name='projects_redirects_delete',
),
url(
r'^(?P<project_slug>[-\w]+)/advertising/$',
Expand Down
79 changes: 42 additions & 37 deletions readthedocs/projects/views/private.py
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,14 @@
from django.utils.translation import ugettext_lazy as _
from django.views.generic import ListView, TemplateView, View
from formtools.wizard.views import SessionWizardView
from vanilla import CreateView, DeleteView, DetailView, GenericView, UpdateView
from vanilla import (
CreateView,
DeleteView,
DetailView,
FormView,
GenericView,
UpdateView,
)

from readthedocs.builds.forms import VersionForm
from readthedocs.builds.models import Version
Expand Down Expand Up @@ -598,50 +605,48 @@ def project_translations_delete(request, project_slug, child_slug):
return HttpResponseRedirect(project_dashboard)


@login_required
def project_redirects(request, project_slug):
class ProjectRedirectsMixin(ProjectAdminMixin, PrivateViewMixin):

"""Project redirects view and form view."""
project = get_object_or_404(
Project.objects.for_admin_user(request.user),
slug=project_slug,
)

form = RedirectForm(data=request.POST or None, project=project)
def get_success_url(self):
return reverse(
'projects_redirects',
args=[self.get_project().slug],
)


if request.method == 'POST' and form.is_valid():
class ProjectRedirects(ProjectRedirectsMixin, FormView):

form_class = RedirectForm
template_name = 'projects/project_redirects.html'

def form_valid(self, form):
form.save()
project_dashboard = reverse('projects_redirects', args=[project.slug])
return HttpResponseRedirect(project_dashboard)
return HttpResponseRedirect(self.get_success_url())

redirects = project.redirects.all()
def get_context_data(self, **kwargs):
context = super().get_context_data(**kwargs)
project = self.get_project()
context['redirects'] = project.redirects.all()
return context

return render(
request,
'projects/project_redirects.html',
{'form': form, 'project': project, 'redirects': redirects},
)

class ProjectRedirectsDelete(ProjectRedirectsMixin, GenericView):

@login_required
def project_redirects_delete(request, project_slug):
"""Project redirect delete view."""
if request.method != 'POST':
return HttpResponseNotAllowed('Only POST is allowed')
project = get_object_or_404(
Project.objects.for_admin_user(request.user),
slug=project_slug,
)
redirect = get_object_or_404(
project.redirects,
pk=request.POST.get('id_pk'),
)
if redirect.project == project:
redirect.delete()
else:
raise Http404
return HttpResponseRedirect(
reverse('projects_redirects', args=[project.slug]),
)
http_method_names = ['post']

def post(self, request, *args, **kwargs):
project = self.get_project()
redirect = get_object_or_404(
project.redirects,
pk=request.POST.get('id_pk'),
)
if redirect.project == project:
redirect.delete()
else:
raise Http404
return HttpResponseRedirect(self.get_success_url())


@login_required
Expand Down