Allow modifying version slugs

readthedocs/builds/forms.py

@@ -3,8 +3,11 @@
 from __future__ import absolute_import
 from builtins import object
 from django import forms
+from django.utils.translation import ugettext_lazy as _, ugettext
 
-from readthedocs.builds.models import VersionAlias, Version
+from .constants import STABLE, LATEST
+from .models import VersionAlias, Version
+from .version_slug import VERSION_SLUG_REGEX
 from readthedocs.projects.models import Project
 from readthedocs.core.utils import trigger_build
 
@@ -29,9 +32,34 @@ def __init__(self, instance=None, *args, **kwargs):  # noqa
 
 class VersionForm(forms.ModelForm):
 
+    slug = forms.RegexField(
+        '^{pattern}$'.format(pattern=VERSION_SLUG_REGEX),
+        max_length=255,
+        help_text=_("Used in this version's URL"),
+    )
+
     class Meta(object):
         model = Version
-        fields = ['active', 'privacy_level', 'tags']
+        fields = ['slug', 'active', 'privacy_level', 'tags']
+
+    def __init__(self, *args, **kwargs):
+        super(VersionForm, self).__init__(*args, **kwargs)
+        if self.instance and self.instance.slug in (LATEST, STABLE):
+            self.fields['slug'].disabled = True
+            self.fields['slug'].help_text += ugettext(' - read only for special versions')
+
+    def clean_slug(self):
+        slug = self.cleaned_data['slug']
+
+        version = self.instance
+        if version:
+            if Version.objects.filter(project=version.project, slug=slug).exclude(
+                    pk=version.pk).exists():
+                raise forms.ValidationError(
+                    _('There is already a version for this project with that slug'),
+                )
+
+        return slug
 
     def save(self, commit=True):
         obj = super(VersionForm, self).save(commit=commit)

readthedocs/projects/forms.py

@@ -394,7 +394,9 @@ def build_versions_form(project):
                 version.identifier[:8],
             )
         else:
-            label = version.verbose_name
+            label = version.slug
+            if version.slug not in version.identifier:
+                label += ' ({})'.format(version.identifier)
         attrs[field_name] = forms.BooleanField(
             label=label,
             widget=DualCheckboxWidget(version),

readthedocs/projects/views/private.py

@@ -22,6 +22,8 @@
 from django.views.generic import ListView, TemplateView, View
 from formtools.wizard.views import SessionWizardView
 from vanilla import CreateView, DeleteView, DetailView, GenericView, UpdateView
+
+from readthedocs.builds.constants import STABLE, LATEST
 from readthedocs.builds.forms import AliasForm, VersionForm
 from readthedocs.builds.models import Version, VersionAlias
 from readthedocs.core.mixins import ListViewWithForm, LoginRequiredMixin
@@ -154,6 +156,12 @@ def project_version_detail(request, project_slug, version_slug):
     if request.method == 'POST' and form.is_valid():
         version = form.save()
         if form.has_changed():
+            if (version.active and 'slug' in form.changed_data and
+                    version.slug not in (STABLE, LATEST)):
+                # Latest and Stable appear "changed" because they are disabled on the form
+                log.info('Triggering a build of the moved version')
+                trigger_build(version.project, version)
+
             if 'active' in form.changed_data and version.active is False:
                 log.info('Removing files for version %s', version.slug)
                 broadcast(

readthedocs/templates/projects/project_version_detail.html

@@ -14,9 +14,16 @@
 {% block content-header %}<h1>{% blocktrans with version.name as version_name %}{{ version_name }}{% endblocktrans %}</h1>{% endblock %}
 
 {% block content %}
-    <h2> Editing {{ version.slug }} </h2>
+    <h2>{% blocktrans with version_name=version.verbose_name %}Editing version {{ version_name }}{% endblocktrans %}</h2>
+
     <form method="post" action=".">
       {% csrf_token %}
+
+      <p>
+      <label>{% trans 'Version control identifier' %}:</label>
+        <strong style="color: black">{{ version.identifier }}</strong>
+      </p>
+
       {{ form.as_p }}
       <p>
         <input style="display: inline;" type="submit" value="{% trans "Save" %}">