Merge pull request #5600 from dojutsu-user/remove-versions

Remove 'Versions' tab from Admin Dashboard.

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(

readthedocs/projects/urls/private.py

@@ -64,10 +64,6 @@
         r'^(?P<project_slug>[-\w]+)/version/(?P<version_slug>[^/]+)/$',
         private.project_version_detail, name='project_version_detail',
     ),
-    url(
-        r'^(?P<project_slug>[-\w]+)/versions/$', private.project_versions,
-        name='projects_versions',
-    ),
     url(
         r'^(?P<project_slug>[-\w]+)/delete/$', private.project_delete,
         name='projects_delete',

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."""

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)

readthedocs/templates/projects/project_edit_base.html

@@ -16,7 +16,6 @@
       <ul>
         <li class="{% block project-edit-active %}{% endblock %}"><a href="{% url "projects_edit" project.slug %}">{% trans "Settings" %} </a></li>
         <li class="{% block project-advanced-active %}{% endblock %}"><a href="{% url "projects_advanced" project.slug %}">{% trans "Advanced Settings" %} </a></li>
-        <li class="{% block project-versions-active %}{% endblock %}"><a href="{% url "projects_versions" project.slug %}" rel="nofollow,noindex">{% trans "Versions" %}</a></li>
         <li class="{% block project-domains-active %}{% endblock %}"><a href="{% url "projects_domains" project.slug %}">{% trans "Domains" %}</a></li>
         <li class="{% block project-users-active %}{% endblock %}"><a href="{% url "projects_users" project.slug %}">{% trans "Maintainers" %}</a></li>
         <li class="{% block project-redirects-active %}{% endblock %}"><a href="{% url "projects_redirects" project.slug %}">{% trans "Redirects" %}</a></li>