move from nominated to full (bug 687998)

Andy McKay · Andy McKay · commit 0dd21117a499 · 2011-10-20T12:51:57.000-07:00
diff --git a/apps/devhub/templates/devhub/payments/first-confirm.html b/apps/devhub/templates/devhub/payments/first-confirm.html
@@ -1,5 +1,12 @@
 <div id="marketplace-confirm" class="hidden">
   <h3>{{ _('Mozilla Marketplace') }}</h3>
+  {% if addon.status == amo.STATUS_UNREVIEWED %}
+    <div class="notification-box warning">
+      {% trans %}Your add-on must have a full review to be in the Mozilla Marketplace.
+      This add-on is currently in the Preliminary Review Queue, so at the end of this wizard
+      we will move your add-on to the Full Review queue.{% endtrans %}
+    </div>
+  {% endif %}
   <p>{% trans doc_url=url('devhub.docs', doc_name='marketplace'),
               agree_url=url('devhub.docs', doc_name='policies', doc_page='agreement') %}
     Thanks for your interest in selling your add-on in the Mozilla Marketplace.
diff --git a/apps/devhub/tests/test_views.py b/apps/devhub/tests/test_views.py
@@ -735,6 +735,19 @@ def test_ask_page(self, can_become_premium):
         doc = pq(res.content)
         eq_(len(doc('div.intro')), 2)
 
+    @mock.patch('addons.models.Addon.can_become_premium')
+    def test_no_warning(self, can_become_premium):
+        can_become_premium.return_value = True
+        doc = pq(self.client.get(self.url).content)
+        eq_(len(doc('div.notification-box')), 0)
+
+    @mock.patch('addons.models.Addon.can_become_premium')
+    def test_warning(self, can_become_premium):
+        can_become_premium.return_value = True
+        self.addon.update(status=amo.STATUS_UNREVIEWED)
+        doc = pq(self.client.get(self.url).content)
+        eq_(len(doc('div.notification-box')), 1)
+
     @mock.patch('addons.models.Addon.can_become_premium')
     def test_cant_become_premium(self, can_become_premium):
         can_become_premium.return_value = False
@@ -952,6 +965,14 @@ def test_wizard_step_4(self):
         eq_(self.client.post(url, {}).status_code, 302)
         assert self.get_addon().is_premium()
 
+    def test_wizard_step_4_status(self):
+        self.setup_premium()
+        self.addon.premium.update(paypal_permissions_token='foo')
+        self.addon.update(status=amo.STATUS_UNREVIEWED)
+        url = reverse('devhub.market.4', args=[self.addon.slug])
+        self.client.post(url, {})
+        eq_(self.get_addon().status, amo.STATUS_NOMINATED)
+
     def test_logs(self):
         self.setup_premium()
         self.addon.premium.update(paypal_permissions_token='foo')
diff --git a/apps/devhub/views.py b/apps/devhub/views.py
@@ -14,7 +14,6 @@
 from django import forms as django_forms
 from django.db.models import Count
 from django.db.utils import IntegrityError
-from django.forms.models import modelformset_factory
 from django.shortcuts import get_object_or_404, redirect
 from django.utils.http import urlquote
 from django.utils.encoding import smart_unicode
@@ -1345,7 +1344,10 @@ def marketplace_confirm(request, addon_id, addon):
     if request.method == 'POST':
         if (addon.premium and addon.premium.is_complete()
             and addon.premium.has_permissions_token()):
-            addon.update(premium_type=amo.ADDON_PREMIUM)
+            if addon.status == amo.STATUS_UNREVIEWED:
+                addon.status = amo.STATUS_NOMINATED
+            addon.premium_type = amo.ADDON_PREMIUM
+            addon.save()
             amo.log(amo.LOG.MAKE_PREMIUM, addon)
             return redirect('devhub.addons.payments', addon.slug)
 
