diff --git a/readthedocs/projects/forms.py b/readthedocs/projects/forms.py index c30cbbb6c53..c73f0b4dd5a 100644 --- a/readthedocs/projects/forms.py +++ b/readthedocs/projects/forms.py @@ -465,47 +465,6 @@ def save_version(self, version): trigger_build(project=self.project, version=version) -def build_versions_form(project): - """Versions form with a list of versions and version privacy levels.""" - attrs = { - 'project': project, - } - versions_qs = project.versions.all() # Admin page, so show all versions - active = versions_qs.filter(active=True) - if active.exists(): - active = sort_version_aware(active) - choices = [(version.slug, version.verbose_name) for version in active] - attrs['default-version'] = forms.ChoiceField( - label=_('Default Version'), - choices=choices, - initial=project.get_default_version(), - ) - versions_qs = sort_version_aware(versions_qs) - for version in versions_qs: - field_name = 'version-{}'.format(version.slug) - privacy_name = 'privacy-{}'.format(version.slug) - if version.type == TAG: - label = '{} ({})'.format( - version.verbose_name, - version.identifier[:8], - ) - else: - label = version.verbose_name - attrs[field_name] = forms.BooleanField( - label=label, - widget=DualCheckboxWidget(version), - initial=version.active, - required=False, - ) - attrs[privacy_name] = forms.ChoiceField( - # This isn't a real label, but just a slug for the template - label='privacy', - choices=constants.PRIVACY_CHOICES, - initial=version.privacy_level, - ) - return type(str('VersionsForm'), (BaseVersionsForm,), attrs) - - class BaseUploadHTMLForm(forms.Form): content = forms.FileField(label=_('Zip file of HTML')) overwrite = forms.BooleanField( diff --git a/readthedocs/projects/urls/private.py b/readthedocs/projects/urls/private.py index 75d6324d03b..8fb72c1b2d2 100644 --- a/readthedocs/projects/urls/private.py +++ b/readthedocs/projects/urls/private.py @@ -64,10 +64,6 @@ r'^(?P[-\w]+)/version/(?P[^/]+)/$', private.project_version_detail, name='project_version_detail', ), - url( - r'^(?P[-\w]+)/versions/$', private.project_versions, - name='projects_versions', - ), url( r'^(?P[-\w]+)/delete/$', private.project_delete, name='projects_delete', diff --git a/readthedocs/projects/views/private.py b/readthedocs/projects/views/private.py index 57e0d0761a3..d360fecd408 100644 --- a/readthedocs/projects/views/private.py +++ b/readthedocs/projects/views/private.py @@ -47,7 +47,6 @@ UpdateProjectForm, UserForm, WebHookForm, - build_versions_form, ) from readthedocs.projects.models import ( Domain, @@ -157,39 +156,6 @@ def get_success_url(self): return reverse('projects_detail', args=[self.object.slug]) -@login_required -def project_versions(request, project_slug): - """ - Project versions view. - - Shows the available versions and lets the user choose which ones he would - like to have built. - """ - project = get_object_or_404( - Project.objects.for_admin_user(request.user), - slug=project_slug, - ) - - if not project.is_imported: - raise Http404 - - form_class = build_versions_form(project) - - form = form_class(data=request.POST or None) - - if request.method == 'POST' and form.is_valid(): - form.save() - messages.success(request, _('Project versions updated')) - project_dashboard = reverse('projects_detail', args=[project.slug]) - return HttpResponseRedirect(project_dashboard) - - return render( - request, - 'projects/project_versions.html', - {'form': form, 'project': project}, - ) - - @login_required def project_version_detail(request, project_slug, version_slug): """Project version detail page.""" diff --git a/readthedocs/rtd_tests/tests/test_views.py b/readthedocs/rtd_tests/tests/test_views.py index 5d450202185..25e7b60a756 100644 --- a/readthedocs/rtd_tests/tests/test_views.py +++ b/readthedocs/rtd_tests/tests/test_views.py @@ -50,8 +50,6 @@ def test_imported_docs(self): _ = form.save() _ = Project.objects.get(slug='django-kong') - r = self.client.get('/dashboard/django-kong/versions/', {}) - self.assertEqual(r.status_code, 200) r = self.client.get('/projects/django-kong/builds/') self.assertEqual(r.status_code, 200) r = self.client.get('/dashboard/django-kong/edit/', {}) @@ -105,10 +103,6 @@ def test_version_detail(self): response = self.client.get('/dashboard/pip/version/0.8.1/') self.assertRedirectToLogin(response) - def test_versions(self): - response = self.client.get('/dashboard/pip/versions/') - self.assertRedirectToLogin(response) - def test_project_delete(self): response = self.client.get('/dashboard/pip/delete/') self.assertRedirectToLogin(response) diff --git a/readthedocs/templates/projects/project_edit_base.html b/readthedocs/templates/projects/project_edit_base.html index ca4699010df..8623a9aecb4 100644 --- a/readthedocs/templates/projects/project_edit_base.html +++ b/readthedocs/templates/projects/project_edit_base.html @@ -16,7 +16,6 @@
  • {% trans "Settings" %}
  • {% trans "Advanced Settings" %}
  • -
  • {% trans "Versions" %}
  • {% trans "Domains" %}
  • {% trans "Maintainers" %}
  • {% trans "Redirects" %}
  • diff --git a/readthedocs/templates/projects/project_versions.html b/readthedocs/templates/projects/project_versions.html deleted file mode 100644 index 38fc4967190..00000000000 --- a/readthedocs/templates/projects/project_versions.html +++ /dev/null @@ -1,55 +0,0 @@ -{% extends "projects/project_edit_base.html" %} -{% load i18n %} - -{% block title %}{% trans "Edit Project Versions" %}{% endblock %} - -{% block project-versions-active %}active{% endblock %} -{% block editing-option-edit-proj %}class="active"{% endblock %} - -{% block project_edit_content_header %}{% trans "Versions" %}{% endblock %} - -{% block project_edit_content %} -
    {% csrf_token %} - -{% for field in form %} - - {% if forloop.first %} - {# This is a custom form listing the possible active versions, to make 1 the default #} -

    {{ field.label }}

    - {{ field }} -

    - {% trans "Choose the version that / will redirect to." %} -

    - - {% else %} - - {% if forloop.counter0 == 1 %} -

    {% trans "Choose Active Versions" %}

    -

    - {% trans "Active versions below will show up on the site." %} -

    - {% endif %} - - - {% if field.label == "privacy" %} - {{ field }} - - {% comment %} - {% elif field.label == "tags" %} - {% trans "Tags" %}: {{ field }} - {% endcomment %} - - {% else %} - {# This is a custom field with a label of the version, and a value of a checkbox denoting if it is active #} -

    {{ field.label}}

    - {% trans "Active" %} {{ field }} - {% endif %} - {% endif %} -
    -{% endfor %} - -

    - -

    -
    -{% endblock %}