From 09ec1cdf899de80d0facc8264a1bd27bcf6d9430 Mon Sep 17 00:00:00 2001
From: Andy McKay <amckay@mozilla.com>
Date: Tue, 22 Mar 2011 16:38:43 -0700
Subject: [PATCH] change labelling (bug 642941)

---
 apps/editors/helpers.py                    |  9 ++++++++
 apps/editors/templates/editors/review.html |  4 ++--
 apps/editors/tests/test_views.py           | 26 ++++++++++++++++++++++
 3 files changed, 37 insertions(+), 2 deletions(-)

diff --git a/apps/editors/helpers.py b/apps/editors/helpers.py
index 3b1805ecbc..a0a99920f9 100644
--- a/apps/editors/helpers.py
+++ b/apps/editors/helpers.py
@@ -19,6 +19,15 @@ from editors.models import (ViewPendingQueue, ViewFullReviewQueue,
 from editors.sql_table import SQLTable
 
 
+@register.function
+def file_review_status(addon, file):
+    if addon.status in [amo.STATUS_UNREVIEWED]:
+        return _('Pending Preliminary Review')
+    elif addon.status in [amo.STATUS_NOMINATED, amo.STATUS_LITE_AND_NOMINATED]:
+        return _('Pending Full Review')
+    return amo.STATUS_CHOICES[file.status]
+
+
 @register.function
 @jinja2.contextfunction
 def editor_page_title(context, title=None, addon=None):
diff --git a/apps/editors/templates/editors/review.html b/apps/editors/templates/editors/review.html
index b5616009e0..a888e79b3d 100644
--- a/apps/editors/templates/editors/review.html
+++ b/apps/editors/templates/editors/review.html
@@ -48,13 +48,13 @@
   {{ _('Files and Validation Results') }}
   <span>[<a href="{{ remora_url('pages/validation') }}">{{ _('help') }}</a>]</span>
 </h3>
-<ul>
+<ul class="files">
 {% for file in version.files.all() %}
 <li>
   <a href="{{ remora_url('/downloads/file/%d/%s' %( file.id, file.filename)) }}">
     <strong>{{ file.filename }}</strong></a>
   <br>
-  {{ status_types[file.status] }}
+  {{ file_review_status(addon, file) }}
   &middot;
   <a href="{{ url('devhub.file_validation', addon.slug, file.id) }}">{{ _('Validation Results') }}</a>
   &middot;
diff --git a/apps/editors/tests/test_views.py b/apps/editors/tests/test_views.py
index c333f8d8c5..965518adde 100644
--- a/apps/editors/tests/test_views.py
+++ b/apps/editors/tests/test_views.py
@@ -1079,3 +1079,29 @@ class TestEditorMOTD(EditorTest):
         r = self.client.post(reverse('editors.save_motd'), {})
         doc = pq(r.content)
         eq_(doc('#editor-motd .errorlist').text(), 'This field is required.')
+
+
+class TestStatusFile(ReviewBase):
+
+    def setUp(self):
+        super(TestStatusFile, self).setUp()
+        self.file = self.addon.current_version.files.all()[0]
+
+    def test_status(self):
+        self.addon.update(status=amo.STATUS_UNREVIEWED)
+        res = self.client.get(self.url)
+        node = pq(res.content)('ul.files li:first-child')
+        assert 'Pending Preliminary Review' in node.text()
+
+    def test_status_full(self):
+        for status in [amo.STATUS_NOMINATED, amo.STATUS_LITE_AND_NOMINATED]:
+            self.addon.update(status=status)
+            res = self.client.get(self.url)
+            node = pq(res.content)('ul.files li:first-child')
+            assert 'Pending Full Review' in node.text()
+
+    def test_other(self):
+        self.addon.update(status=amo.STATUS_BETA)
+        res = self.client.get(self.url)
+        node = pq(res.content)('ul.files li:first-child')
+        assert unicode(amo.STATUS_CHOICES[self.file.status]) in node.text()