[extensions-web] extensions: Actually actually only show the message for unreviewed extensions

[Jasper St. Pierre <jstpierre src gnome org>]

commit afd37e6161742f41fb2ad6e0dd67ebd5fdbb3b13
Author: Jasper St. Pierre <jstpierre mecheye net>
Date:   Thu Apr 26 02:32:13 2012 -0400

    extensions: Actually actually only show the message for unreviewed extensions

 sweettooth/extensions/models.py                    |    3 --
 .../extensions/templates/extensions/detail.html    |    2 +-
 sweettooth/extensions/views.py                     |   27 ++++++++++---------
 3 files changed, 15 insertions(+), 17 deletions(-)
---
diff --git a/sweettooth/extensions/models.py b/sweettooth/extensions/models.py
index 608d5b2..679b2de 100644
--- a/sweettooth/extensions/models.py
+++ b/sweettooth/extensions/models.py
@@ -404,9 +404,6 @@ class ExtensionVersion(models.Model):
     def is_inactive(self):
         return self.status == STATUS_INACTIVE
 
-    def is_unreviewed(self):
-        return self.status == STATUS_UNREVIEWED
-
 submitted_for_review = Signal(providing_args=["request", "version"])
 reviewed = Signal(providing_args=["request", "version", "review"])
 status_changed = Signal(providing_args=["version", "log"])
diff --git a/sweettooth/extensions/templates/extensions/detail.html b/sweettooth/extensions/templates/extensions/detail.html
index 95f7ef9..d5e8cdc 100644
--- a/sweettooth/extensions/templates/extensions/detail.html
+++ b/sweettooth/extensions/templates/extensions/detail.html
@@ -58,7 +58,7 @@
       {% endif %}
       </dl>
 
-      {% if not is_unreviewed %}
+      {% if is_unreviewed %}
       <p class="step">
         A reviewer will review the extension you submitted to make sure there's nothing too
         dangerous. You'll be emailed the result of the review.
diff --git a/sweettooth/extensions/views.py b/sweettooth/extensions/views.py
index c96ec12..3b6f6b4 100644
--- a/sweettooth/extensions/views.py
+++ b/sweettooth/extensions/views.py
@@ -254,6 +254,7 @@ def extension_version_view(request, obj, **kwargs):
     context = dict(version = version,
                    extension = extension,
                    shell_version_map = json.dumps(shell_version_map),
+                   is_unreviewed = status == models.STATUS_UNREVIEWED,
                    is_visible = status == models.STATUS_ACTIVE,
                    is_rejected = status == models.STATUS_REJECTED)
 
@@ -406,23 +407,23 @@ def upload_file(request):
                 version = models.ExtensionVersion.objects.create(extension=extension,
                                                                  source=file_source,
                                                                  status=models.STATUS_UNREVIEWED)
-                version.parse_metadata_json(metadata)
-                version.replace_metadata_json()
-                version.save()
+                 version.parse_metadata_json(metadata)
+                 version.replace_metadata_json()
+                 version.save()
 
-                models.submitted_for_review.send(sender=request, request=request, version=version)
+                 models.submitted_for_review.send(sender=request, request=request, version=version)
 
-                transaction.commit()
+                 transaction.commit()
 
-                return redirect(version)
-    else:
-        form = UploadForm()
+                 return redirect(version)
+     else:
+         form = UploadForm()
 
-    # XXX - context managers may dirty the connection, so we need
-    # to force a clean state after this.
-    response = render(request, 'extensions/upload.html', dict(form=form,
-                                                              errors=errors))
+     # XXX - context managers may dirty the connection, so we need
+     # to force a clean state after this.
+     response = render(request, 'extensions/upload.html', dict(form=form,
+                                                               errors=errors))
 
-    transaction.set_clean()
+     transaction.set_clean()
 
     return response