Skip to content

Remove project_version_delete_html view #4950

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

Closed
wants to merge 1 commit into from
Closed
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
4 changes: 0 additions & 4 deletions readthedocs/projects/urls/private.py
Original file line number Diff line number Diff line change
Expand Up @@ -44,10 +44,6 @@
ProjectAdvancedUpdate.as_view(),
name='projects_advanced'),

url(r'^(?P<project_slug>[-\w]+)/version/(?P<version_slug>[^/]+)/delete_html/$',
private.project_version_delete_html,
name='project_version_delete_html'),

url(r'^(?P<project_slug>[-\w]+)/version/(?P<version_slug>[^/]+)/$',
private.project_version_detail,
name='project_version_detail'),
Expand Down
37 changes: 0 additions & 37 deletions readthedocs/projects/views/private.py
Original file line number Diff line number Diff line change
Expand Up @@ -677,43 +677,6 @@ def project_redirects_delete(request, project_slug):
)


@login_required
def project_version_delete_html(request, project_slug, version_slug):
"""
Project version 'delete' HTML.

This marks a version as not built
"""
project = get_object_or_404(
Project.objects.for_admin_user(request.user),
slug=project_slug,
)
version = get_object_or_404(
Version.objects.public(
user=request.user,
project=project,
only_active=False,
),
slug=version_slug,
)

if not version.active:
version.built = False
version.save()
broadcast(
type='app',
task=tasks.clear_artifacts,
args=[version.get_artifact_paths()],
)
else:
return HttpResponseBadRequest(
"Can't delete HTML for an active version.",
)
return HttpResponseRedirect(
reverse('project_version_list', kwargs={'project_slug': project_slug}),
)


class DomainMixin(ProjectAdminMixin, PrivateViewMixin):
model = Domain
form_class = DomainForm
Expand Down
4 changes: 0 additions & 4 deletions readthedocs/rtd_tests/tests/test_views.py
Original file line number Diff line number Diff line change
Expand Up @@ -102,10 +102,6 @@ def test_advanced(self):
response = self.client.get('/dashboard/pip/advanced/')
self.assertRedirectToLogin(response)

def test_version_delete_html(self):
response = self.client.get('/dashboard/pip/version/0.8.1/delete_html/')
self.assertRedirectToLogin(response)

def test_version_detail(self):
response = self.client.get('/dashboard/pip/version/0.8.1/')
self.assertRedirectToLogin(response)
Expand Down
5 changes: 1 addition & 4 deletions readthedocs/templates/projects/project_version_list.html
Original file line number Diff line number Diff line change
Expand Up @@ -104,16 +104,13 @@ <h1>{% trans "Inactive Versions" %}</h1>

{% if request.user|is_admin:project %}
<ul class="module-item-menu">
{% if version.built %}
<li><a href="{% url "project_version_delete_html" project.slug version.slug %}">{% trans "Clean" %}</a></li>
{% endif %}
<li><a href="{% url "project_version_detail" project.slug version.slug %}">{% trans "Edit" %}</a></li>
</ul>
{% endif %}

</li>
{% endblock inactive-versions %}

{% endfor %}
</ul>
</div>
Expand Down