Skip to content

Commit 7982459

Browse files
committed
Remove project_version_delete_html view
We used to have a "Clean" button in the Inactive Versions listing to remove built and disabled versions of the documentation. This is not more possible, because when the version is disabled (mark as non active) we call `clean_artifacts` and remove all the HTML files for this version and mark it as `Version.build=False`. In the end, that button does not appear anymore. Related #4937
1 parent 46b5e06 commit 7982459

File tree

4 files changed

+1
-49
lines changed

4 files changed

+1
-49
lines changed

readthedocs/projects/urls/private.py

-4
Original file line numberDiff line numberDiff line change
@@ -44,10 +44,6 @@
4444
ProjectAdvancedUpdate.as_view(),
4545
name='projects_advanced'),
4646

47-
url(r'^(?P<project_slug>[-\w]+)/version/(?P<version_slug>[^/]+)/delete_html/$',
48-
private.project_version_delete_html,
49-
name='project_version_delete_html'),
50-
5147
url(r'^(?P<project_slug>[-\w]+)/version/(?P<version_slug>[^/]+)/$',
5248
private.project_version_detail,
5349
name='project_version_detail'),

readthedocs/projects/views/private.py

-37
Original file line numberDiff line numberDiff line change
@@ -677,43 +677,6 @@ def project_redirects_delete(request, project_slug):
677677
)
678678

679679

680-
@login_required
681-
def project_version_delete_html(request, project_slug, version_slug):
682-
"""
683-
Project version 'delete' HTML.
684-
685-
This marks a version as not built
686-
"""
687-
project = get_object_or_404(
688-
Project.objects.for_admin_user(request.user),
689-
slug=project_slug,
690-
)
691-
version = get_object_or_404(
692-
Version.objects.public(
693-
user=request.user,
694-
project=project,
695-
only_active=False,
696-
),
697-
slug=version_slug,
698-
)
699-
700-
if not version.active:
701-
version.built = False
702-
version.save()
703-
broadcast(
704-
type='app',
705-
task=tasks.clear_artifacts,
706-
args=[version.get_artifact_paths()],
707-
)
708-
else:
709-
return HttpResponseBadRequest(
710-
"Can't delete HTML for an active version.",
711-
)
712-
return HttpResponseRedirect(
713-
reverse('project_version_list', kwargs={'project_slug': project_slug}),
714-
)
715-
716-
717680
class DomainMixin(ProjectAdminMixin, PrivateViewMixin):
718681
model = Domain
719682
form_class = DomainForm

readthedocs/rtd_tests/tests/test_views.py

-4
Original file line numberDiff line numberDiff line change
@@ -102,10 +102,6 @@ def test_advanced(self):
102102
response = self.client.get('/dashboard/pip/advanced/')
103103
self.assertRedirectToLogin(response)
104104

105-
def test_version_delete_html(self):
106-
response = self.client.get('/dashboard/pip/version/0.8.1/delete_html/')
107-
self.assertRedirectToLogin(response)
108-
109105
def test_version_detail(self):
110106
response = self.client.get('/dashboard/pip/version/0.8.1/')
111107
self.assertRedirectToLogin(response)

readthedocs/templates/projects/project_version_list.html

+1-4
Original file line numberDiff line numberDiff line change
@@ -104,16 +104,13 @@ <h1>{% trans "Inactive Versions" %}</h1>
104104

105105
{% if request.user|is_admin:project %}
106106
<ul class="module-item-menu">
107-
{% if version.built %}
108-
<li><a href="{% url "project_version_delete_html" project.slug version.slug %}">{% trans "Clean" %}</a></li>
109-
{% endif %}
110107
<li><a href="{% url "project_version_detail" project.slug version.slug %}">{% trans "Edit" %}</a></li>
111108
</ul>
112109
{% endif %}
113110

114111
</li>
115112
{% endblock inactive-versions %}
116-
113+
117114
{% endfor %}
118115
</ul>
119116
</div>

0 commit comments

Comments
 (0)