From d61b52e9c4404e1bee4edf360e04d3b196528bf0 Mon Sep 17 00:00:00 2001
From: dojutsu-user <vaibhgupt199@gmail.com>
Date: Wed, 23 Jan 2019 14:21:50 +0530
Subject: [PATCH 1/2] sort versions

---
 readthedocs/projects/forms.py                | 22 +++++++++++++++++---
 readthedocs/projects/views/public.py         |  2 ++
 readthedocs/templates/core/version_list.html |  4 +++-
 3 files changed, 24 insertions(+), 4 deletions(-)

diff --git a/readthedocs/projects/forms.py b/readthedocs/projects/forms.py
index 1c0bb4f37dd..ca55e456606 100644
--- a/readthedocs/projects/forms.py
+++ b/readthedocs/projects/forms.py
@@ -22,6 +22,7 @@
 from readthedocs.oauth.models import RemoteRepository
 from readthedocs.projects import constants
 from readthedocs.projects.exceptions import ProjectSpamError
+from readthedocs.projects.templatetags.projects_tags import sort_version_aware
 from readthedocs.projects.models import (
     Domain,
     EmailHook,
@@ -235,9 +236,7 @@ def __init__(self, *args, **kwargs):
             choices=[default_choice] + list(all_versions),
         )
 
-        active_versions = self.instance.all_active_versions().values_list(
-            'slug', 'verbose_name'
-        )  # yapf: disabled
+        active_versions = self.get_all_active_versions()
         self.fields['default_version'].widget = forms.Select(
             choices=active_versions,
         )
@@ -253,6 +252,21 @@ def clean_conf_py_file(self):
             )  # yapf: disable
         return filename
 
+    def get_all_active_versions(self):
+        """
+        Returns all active versions.
+
+        Returns a smartly sorted list of tuples.
+        First item of each tuple is the version's slug,
+        and the second item is version's verbose_name.
+        """
+        version_qs = self.instance.all_active_versions()
+        if version_qs.exists():
+            version_qs = sort_version_aware(version_qs)
+            all_versions = [(version.slug, version.verbose_name) for version in version_qs]
+            return all_versions
+        return [()]
+
 
 class UpdateProjectForm(
         ProjectTriggerBuildMixin,
@@ -429,12 +443,14 @@ def build_versions_form(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)
diff --git a/readthedocs/projects/views/public.py b/readthedocs/projects/views/public.py
index 8b412a4c3d8..37584be9677 100644
--- a/readthedocs/projects/views/public.py
+++ b/readthedocs/projects/views/public.py
@@ -26,6 +26,7 @@
 from readthedocs.builds.views import BuildTriggerMixin
 from readthedocs.projects.models import Project
 from readthedocs.search.indexes import PageIndex
+from readthedocs.projects.templatetags.projects_tags import sort_version_aware
 from readthedocs.search.views import LOG_TEMPLATE
 
 from .base import ProjectOnboardMixin
@@ -171,6 +172,7 @@ def project_downloads(request, project_slug):
         slug=project_slug,
     )
     versions = Version.objects.public(user=request.user, project=project)
+    versions = sort_version_aware(versions)
     version_data = OrderedDict()
     for version in versions:
         data = version.get_downloads()
diff --git a/readthedocs/templates/core/version_list.html b/readthedocs/templates/core/version_list.html
index a823755a1db..5b92da2b952 100644
--- a/readthedocs/templates/core/version_list.html
+++ b/readthedocs/templates/core/version_list.html
@@ -1,6 +1,8 @@
+{% load projects_tags %}
+
 <div class="module-list-wrapper">
   <ul>
-  {% for version in versions %}
+  {% for version in versions|sort_version_aware %}
     <li class="module-item">
       {# Link to the docs #}
       <a class="module-item-title" href="{{ version.get_absolute_url }}">{{ version.slug }}</a>

From f68ca0e3f356008d59b4a437c8643775509b99e4 Mon Sep 17 00:00:00 2001
From: dojutsu-user <vaibhgupt199@gmail.com>
Date: Wed, 23 Jan 2019 21:18:41 +0530
Subject: [PATCH 2/2] delete unused html file

---
 readthedocs/templates/core/version_list.html | 20 --------------------
 1 file changed, 20 deletions(-)
 delete mode 100644 readthedocs/templates/core/version_list.html

diff --git a/readthedocs/templates/core/version_list.html b/readthedocs/templates/core/version_list.html
deleted file mode 100644
index 5b92da2b952..00000000000
--- a/readthedocs/templates/core/version_list.html
+++ /dev/null
@@ -1,20 +0,0 @@
-{% load projects_tags %}
-
-<div class="module-list-wrapper">
-  <ul>
-  {% for version in versions|sort_version_aware %}
-    <li class="module-item">
-      {# Link to the docs #}
-      <a class="module-item-title" href="{{ version.get_absolute_url }}">{{ version.slug }}</a>
-      {% if request.user in project.users.all %}
-        <span class="right-menu quiet">{{ version.get_privacy_level_display }}</span>
-      {% endif %}
-      {% if request.user in project.users.all %}
-        <ul class="module-item-menu">
-          <li><a href="{% url "project_version_detail" project.slug version.slug %}">{% trans "Add tags" %}</a></li>
-        </ul>
-      {% endif %}
-    </li>
-  {% endfor %}
-  </ul>
-</div>