Merge branch 'versions'

Author: Jeff Balogh

apps/devhub/forms.py

@@ -11,6 +11,7 @@
 import paypal
 from addons.models import Addon, AddonUser, Charity
 from applications.models import Application, AppVersion
+from files.models import File
 from translations.widgets import TranslationTextarea, TranslationTextInput
 from translations.models import delete_translation
 from versions.models import License, Version, ApplicationsVersions
@@ -273,3 +274,41 @@ def clean(self):
 CompatFormSet = modelformset_factory(
     ApplicationsVersions, formset=BaseCompatFormSet,
     form=CompatForm, can_delete=True, extra=0)
+
+
+class FileForm(happyforms.ModelForm):
+    _choices = [(k, amo.STATUS_CHOICES[k]) for k in
+                (amo.STATUS_BETA, amo.STATUS_UNREVIEWED)]
+    status = forms.TypedChoiceField(coerce=int, choices=_choices)
+    platform = File._meta.get_field('platform').formfield(empty_label=None)
+
+    class Meta:
+        model = File
+        fields = ('status', 'platform')
+
+    def __init__(self, *args, **kw):
+        super(FileForm, self).__init__(*args, **kw)
+        # Make sure the current status is in the status <select>.
+        status = kw['instance'].status
+        field = self.fields['status']
+        if status not in dict(field.choices).keys():
+            # Rebind and add so the original choices aren't changed.
+            field.choices = (field.choices +
+                             [(status, amo.STATUS_CHOICES[status])])
+
+
+class BaseFileFormSet(BaseModelFormSet):
+
+    def clean(self):
+        if any(self.errors):
+            return
+        files = [f.cleaned_data for f in self.forms
+                 if not f.cleaned_data.get('DELETE', False)]
+        platforms = [f['platform'] for f in files]
+        if sorted(platforms) != sorted(set(platforms)):
+            raise forms.ValidationError(
+                _('A platform can only be chosen once.'))
+
+
+FileFormSet = modelformset_factory(File, formset=BaseFileFormSet,
+                                   form=FileForm, can_delete=True, extra=0)

apps/devhub/templates/devhub/versions/edit.html

@@ -24,6 +24,24 @@ <h3>{{ title }}</h3>
     <div class="featured-inner">
       <form method="post" action="">
         {{ csrf() }}
+        <table>
+          {{ file_form.management_form|safe }}
+          {% for form in file_form.forms %}
+            {% with file = form.instance %}
+              <tr>
+                <td><a href="{{ file.get_url_path(amo.FIREFOX, 'devhub') }}">
+                    {{ file.filename }}</a></td>
+                <td>{{ (file.size * 1000)|filesizeformat }}</td>
+                <td>{{ form.platform|safe }}</td>
+                <td>{{ form.status|safe }}</td>
+                <td>
+                  {{ form.DELETE|safe }}
+                  {{ form.id|safe }}
+                </td>
+              </tr>
+            {% endwith %}
+          {% endfor %}
+        </table>
         <table>
           {{ compat_form.management_form|safe }}
           {% for form in compat_form.initial_forms %}

apps/devhub/tests/test_views.py

@@ -15,7 +15,8 @@
 from amo.urlresolvers import reverse
 from addons.models import Addon, AddonUser, Charity
 from applications.models import AppVersion
-from devhub.forms import ContribForm, ProfileForm
+from devhub.forms import ContribForm
+from files.models import File, Platform
 from users.models import UserProfile
 from versions.models import License, Version
 
@@ -157,7 +158,7 @@ def formset(*args, **kw):
     prefix and initial_count can be set in **kw.
     """
     prefix = kw.pop('prefix', 'form')
-    initial_count = kw.pop('initial_count', 0)
+    initial_count = kw.pop('initial_count', len(args))
     data = {prefix + '-TOTAL_FORMS': len(args),
             prefix + '-INITIAL_FORMS': initial_count}
     for idx, d in enumerate(args):
@@ -353,8 +354,10 @@ def test_add_user_twice(self):
             ['An author can only be listed once.'])
 
     def test_success_delete_user(self):
+        # Add a new user so we have one to delete.
         data = self.formset(dict(user='regular@mozilla.com', listed=True,
-                                 role=amo.AUTHOR_ROLE_OWNER, position=1))
+                                 role=amo.AUTHOR_ROLE_OWNER, position=1),
+                            initial_count=0)
         self.client.post(self.url, data)
 
         one, two = self.client.get(self.url).context['user_form'].initial_forms
@@ -839,16 +842,90 @@ def formset(self, *args, **kw):
         defaults.update(kw)
         return formset(*args, **defaults)
 
+
+class TestVersionEditDetails(TestVersionEdit):
+
+    def setUp(self):
+        super(TestVersionEditDetails, self).setUp()
+        ctx = self.client.get(self.url).context
+        compat = initial(ctx['compat_form'].forms[0])
+        files = initial(ctx['file_form'].forms[0])
+        self.initial = formset(compat, **formset(files, prefix='files'))
+
+    def formset(self, *args, **kw):
+        defaults = dict(self.initial)
+        defaults.update(kw)
+        return super(TestVersionEditDetails, self).formset(*args, **defaults)
+
     def test_edit_notes(self):
-        f = self.client.get(self.url).context['compat_form'].initial_forms[0]
-        d = formset(initial(f), releasenotes='xx', approvalnotes='yy',
-                    initial_count=1)
+        d = self.formset(releasenotes='xx', approvalnotes='yy')
         r = self.client.post(self.url, d)
         eq_(r.status_code, 302)
         version = self.get_version()
         eq_(unicode(version.releasenotes), 'xx')
         eq_(unicode(version.approvalnotes), 'yy')
 
+    def test_version_number_redirect(self):
+        url = self.url.replace(str(self.version.id), self.version.version)
+        r = self.client.get(url, follow=True)
+        self.assertRedirects(r, self.url)
+
+
+class TestVersionEditFiles(TestVersionEdit):
+
+    def setUp(self):
+        super(TestVersionEditFiles, self).setUp()
+        f = self.client.get(self.url).context['compat_form'].initial_forms[0]
+        self.compat = initial(f)
+
+    def formset(self, *args, **kw):
+        compat = formset(self.compat, initial_count=1)
+        compat.update(kw)
+        return super(TestVersionEditFiles, self).formset(*args, **compat)
+
+    def test_edit_status(self):
+        f = self.client.get(self.url).context['file_form'].forms[0]
+        # Public is one of the choices since the file is currently public.
+        eq_([x[0] for x in f.fields['status'].choices],
+            [amo.STATUS_BETA, amo.STATUS_UNREVIEWED, amo.STATUS_PUBLIC])
+        # Switch the status to Beta.
+        data = initial(f)
+        data['status'] = amo.STATUS_BETA
+        r = self.client.post(self.url, self.formset(data, prefix='files'))
+        eq_(r.status_code, 302)
+        eq_(self.version.files.get().status, amo.STATUS_BETA)
+
+        # Beta and unreviewed are the only choices.
+        f = self.client.get(self.url).context['file_form'].forms[0]
+        eq_([x[0] for x in f.fields['status'].choices],
+            [amo.STATUS_BETA, amo.STATUS_UNREVIEWED])
+
+    def test_unique_platforms(self):
+        for platform in amo.PLATFORMS:
+            k, _ = Platform.objects.get_or_create(id=platform)
+        # Move the existing file to Linux.
+        f = self.version.files.get()
+        f.update(platform=Platform.objects.get(id=amo.PLATFORM_LINUX.id))
+        # And make a new file for Mac.
+        File.objects.create(version=self.version,
+                            platform_id=amo.PLATFORM_MAC.id)
+
+        forms = map(initial,
+                    self.client.get(self.url).context['file_form'].forms)
+        forms[1]['platform'] = forms[0]['platform']
+        r = self.client.post(self.url, self.formset(*forms, prefix='files'))
+        eq_(r.status_code, 200)
+        eq_(r.context['file_form'].non_form_errors(),
+            ['A platform can only be chosen once.'])
+
+
+class TestVersionEditCompat(TestVersionEdit):
+
+    def formset(self, *args, **kw):
+        defaults = formset(prefix='files')
+        defaults.update(kw)
+        return super(TestVersionEditCompat, self).formset(*args, **defaults)
+
     def test_add_appversion(self):
         f = self.client.get(self.url).context['compat_form'].initial_forms[0]
         d = self.formset(initial(f), dict(application=18, min=28, max=29),

apps/devhub/urls.py

@@ -21,8 +21,9 @@
         views.addons_section, name='devhub.addons.section'),
 
     url('^versions/$', views.version_list, name='devhub.versions'),
-    url('^versions/(?P<version_id>[^/]+)$', views.version_edit,
+    url('^versions/(?P<version_id>\d+)$', views.version_edit,
         name='devhub.versions.edit'),
+    url('^versions/(?P<version>[^/]+)$', views.version_bounce),
 )
 
 urlpatterns = decorate(write, patterns('',

apps/devhub/views.py

@@ -288,18 +288,32 @@ def version_edit(request, addon_id, addon, version_id):
     version_form = forms.VersionForm(request.POST or None, instance=version)
     compat_form = forms.CompatFormSet(request.POST or None,
                                       queryset=version.apps.all())
-    fs = [version_form, compat_form]
+    file_form = forms.FileFormSet(request.POST or None, prefix='files',
+                                  queryset=version.files.all())
+    fs = [version_form, compat_form, file_form]
     if request.method == 'POST' and all([form.is_valid() for form in fs]):
         version_form.save()
+        file_form.save()
         for compat in compat_form.save(commit=False):
             compat.version = version
             compat.save()
         return redirect('devhub.versions.edit', addon_id, version_id)
     return jingo.render(request, 'devhub/versions/edit.html',
         dict(addon=addon, version=version, version_form=version_form,
-             compat_form=compat_form))
+             compat_form=compat_form, file_form=file_form))
 
 
 @dev_required
 def version_list(request, addon_id, addon):
     return http.HttpResponse('All right then!')
+
+
+@dev_required
+def version_bounce(request, addon_id, addon, version):
+    # Use filter since there could be dupes.
+    vs = (Version.objects.filter(version=version, addon=addon)
+          .order_by('-created'))
+    if vs:
+        return redirect('devhub.versions.edit', addon_id, vs[0].id)
+    else:
+        raise http.Http404()

apps/files/models.py

@@ -19,7 +19,7 @@ class File(amo.models.ModelBase):
     version = models.ForeignKey('versions.Version', related_name='files')
     platform = models.ForeignKey('Platform')
     filename = models.CharField(max_length=255, default='')
-    size = models.PositiveIntegerField(default=0)
+    size = models.PositiveIntegerField(default=0)  # kilobytes
     hash = models.CharField(max_length=255, default='')
     codereview = models.BooleanField(default=False)
     jetpack = models.BooleanField(default=False)
@@ -107,6 +107,9 @@ class Platform(amo.models.ModelBase):
     class Meta(amo.models.ModelBase.Meta):
         db_table = 'platforms'
 
+    def __unicode__(self):
+        return unicode(amo.PLATFORMS[self.id].name)
+
 
 class FileUpload(amo.models.ModelBase):
     """Created when a file is uploaded for validation/submission."""