[extensions-web] Swap the word "locked" with "unreviewed"

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

commit 7a0742b97777aa5c1242e1a89cf8b733172d341c
Author: Jasper St. Pierre <jstpierre mecheye net>
Date:   Sun Mar 4 16:26:39 2012 -0500

    Swap the word "locked" with "unreviewed"
    
    The concept of locking an extension is dead. Remove it from the codebase.

 sweettooth/extensions/models.py         |    8 ++++----
 sweettooth/extensions/urls.py           |    2 +-
 sweettooth/extensions/views.py          |    7 +++----
 sweettooth/review/context_processors.py |    5 ++---
 sweettooth/review/urls.py               |    2 +-
 5 files changed, 11 insertions(+), 13 deletions(-)
---
diff --git a/sweettooth/extensions/models.py b/sweettooth/extensions/models.py
index 58bd53c..409b722 100644
--- a/sweettooth/extensions/models.py
+++ b/sweettooth/extensions/models.py
@@ -15,13 +15,13 @@ import autoslug
 import re
 from sorl import thumbnail
 
-(STATUS_NEW, STATUS_LOCKED,
+(STATUS_NEW, STATUS_UNREVIEWED,
  STATUS_REJECTED, STATUS_INACTIVE,
  STATUS_ACTIVE) = xrange(5)
 
 STATUSES = {
     STATUS_NEW: u"New",
-    STATUS_LOCKED: u"Unreviewed",
+    STATUS_UNREVIEWED: u"Unreviewed",
     STATUS_REJECTED: u"Rejected",
     STATUS_INACTIVE: u"Inactive",
     STATUS_ACTIVE: u"Active",
@@ -268,8 +268,8 @@ def parse_zipfile_metadata(uploaded_file):
 filename_max_length = Extension._meta.get_field('uuid').max_length + len(".v000.shell-version.zip")
 
 class ExtensionVersionManager(models.Manager):
-    def locked(self):
-        return self.filter(status=STATUS_LOCKED)
+    def unreviewed(self):
+        return self.filter(status=STATUS_UNREVIEWED)
 
     def visible(self):
         return self.filter(status__in=VISIBLE_STATUSES)
diff --git a/sweettooth/extensions/urls.py b/sweettooth/extensions/urls.py
index 56f28db..865744d 100644
--- a/sweettooth/extensions/urls.py
+++ b/sweettooth/extensions/urls.py
@@ -6,7 +6,7 @@ from extensions import views, models, feeds
 
 ajax_patterns = patterns('',
     url(r'^edit/(?P<pk>\d+)', views.ajax_inline_edit_view, name='extensions-ajax-inline'),
-    url(r'^submit/(?P<pk>\d+)', views.ajax_submit_and_lock_view, name='extensions-ajax-submit'),
+    url(r'^submit/(?P<pk>\d+)', views.ajax_submit_extension_view, name='extensions-ajax-submit'),
     url(r'^upload/screenshot/(?P<pk>\d+)', views.ajax_upload_screenshot_view, name='extensions-ajax-screenshot'),
     url(r'^upload/icon/(?P<pk>\d+)', views.ajax_upload_icon_view, name='extensions-ajax-icon'),
     url(r'^detail/', views.ajax_details_view, name='extensions-ajax-details'),
diff --git a/sweettooth/extensions/views.py b/sweettooth/extensions/views.py
index d7a3b62..dcce285 100644
--- a/sweettooth/extensions/views.py
+++ b/sweettooth/extensions/views.py
@@ -192,8 +192,7 @@ def extension_version_view(request, obj, **kwargs):
 
     status = version.status
     if status == models.STATUS_NEW:
-        # If it's unreviewed and unlocked, this is a preview
-        # for pre-lock.
+        # If it's new, this is a preview before it's submitted
         is_preview = True
 
     # Redirect if we don't match the slug or extension PK.
@@ -252,14 +251,14 @@ def ajax_adjust_popularity_view(request):
 @ajax_view
 @require_POST
 @model_view(models.ExtensionVersion)
-def ajax_submit_and_lock_view(request, obj):
+def ajax_submit_extension_view(request, obj):
     if not obj.extension.user_can_edit(request.user):
         return HttpResponseForbidden()
 
     if obj.status != models.STATUS_NEW:
         return HttpResponseForbidden()
 
-    obj.status = models.STATUS_LOCKED
+    obj.status = models.STATUS_UNREVIEWED
     obj.save()
 
     models.submitted_for_review.send(sender=request, request=request, version=obj)
diff --git a/sweettooth/review/context_processors.py b/sweettooth/review/context_processors.py
index 7b3343c..9ac7a14 100644
--- a/sweettooth/review/context_processors.py
+++ b/sweettooth/review/context_processors.py
@@ -1,9 +1,8 @@
 
-from extensions.models import ExtensionVersion, STATUS_LOCKED
+from extensions.models import ExtensionVersion
 
 def n_unreviewed_extensions(request):
     if not request.user.has_perm("review.can-review-extensions"):
         return dict()
 
-    unreviewed = ExtensionVersion.objects.filter(status=STATUS_LOCKED)
-    return dict(n_unreviewed_extensions=unreviewed.count())
+    return dict(n_unreviewed_extensions=ExtensionVersion.unreviewed().count())
diff --git a/sweettooth/review/urls.py b/sweettooth/review/urls.py
index 24fdb9f..59d94f6 100644
--- a/sweettooth/review/urls.py
+++ b/sweettooth/review/urls.py
@@ -6,7 +6,7 @@ from extensions.models import ExtensionVersion
 from review import views
 
 urlpatterns = patterns('',
-    url(r'^$', object_list, dict(queryset=ExtensionVersion.objects.locked(),
+    url(r'^$', object_list, dict(queryset=ExtensionVersion.objects.unreviewed(),
                                  template_object_name='version',
                                  template_name='review/list.html'),
         name='review-list'),