[extensions-web] Don't use "obj"



commit 729d6d60be0f6a4248f995c66dc84df187ce86dc
Author: Jasper St. Pierre <jstpierre mecheye net>
Date:   Mon Aug 6 16:45:19 2012 -0300

    Don't use "obj"

 sweettooth/extensions/views.py |   30 +++++++++++++++---------------
 sweettooth/review/views.py     |    6 +++---
 2 files changed, 18 insertions(+), 18 deletions(-)
---
diff --git a/sweettooth/extensions/views.py b/sweettooth/extensions/views.py
index 8f9c52a..f6b97b2 100644
--- a/sweettooth/extensions/views.py
+++ b/sweettooth/extensions/views.py
@@ -236,7 +236,7 @@ def extension_view(request, obj, **kwargs):
     else:
         template_name = "extensions/detail.html"
 
-    context = dict(shell_version_map = obj.visible_shell_version_map_json,
+    context = dict(shell_version_map = extension.visible_shell_version_map_json,
                    extension = extension,
                    all_versions = extension.versions.order_by('-version'),
                    is_visible = extension.latest_version is not None)
@@ -263,8 +263,8 @@ def ajax_adjust_popularity_view(request):
 @ajax_view
 @require_POST
 @model_view(models.Extension)
-def ajax_inline_edit_view(request, obj):
-    if not obj.user_can_edit(request.user):
+def ajax_inline_edit_view(request, extension):
+    if not extension.user_can_edit(request.user):
         return HttpResponseForbidden()
 
     key = request.POST['id']
@@ -273,33 +273,33 @@ def ajax_inline_edit_view(request, obj):
         key = key[len('extension_'):]
 
     if key == 'name':
-        obj.name = value
+        extension.name = value
     elif key == 'description':
-        obj.description = value
+        extension.description = value
     elif key == 'url':
-        obj.url = value
+        extension.url = value
     else:
         return HttpResponseForbidden()
 
-    obj.save()
+    extension.save()
 
     return value
 
 @ajax_view
 @require_POST
 @model_view(models.Extension)
-def ajax_upload_screenshot_view(request, obj):
-    obj.screenshot = request.FILES['file']
-    obj.save(replace_metadata_json=False)
-    return get_thumbnail(obj.screenshot, request.GET['geometry']).url
+def ajax_upload_screenshot_view(request, extension):
+    extension.screenshot = request.FILES['file']
+    extension.save(replace_metadata_json=False)
+    return get_thumbnail(extension.screenshot, request.GET['geometry']).url
 
 @ajax_view
 @require_POST
 @model_view(models.Extension)
-def ajax_upload_icon_view(request, obj):
-    obj.icon = request.FILES['file']
-    obj.save(replace_metadata_json=False)
-    return obj.icon.url
+def ajax_upload_icon_view(request, extension):
+    extension.icon = request.FILES['file']
+    extension.save(replace_metadata_json=False)
+    return extension.icon.url
 
 def ajax_details(extension, version=None):
     details = dict(uuid = extension.uuid,
diff --git a/sweettooth/review/views.py b/sweettooth/review/views.py
index 17b438e..88f52ed 100644
--- a/sweettooth/review/views.py
+++ b/sweettooth/review/views.py
@@ -238,7 +238,7 @@ def submit_review_view(request, obj):
 
     # If a normal user didn't change the status and it was in WAITING,
     # change it back to UNREVIEWED
-    if not can_approve and obj.status == models.STATUS_WAITING:
+    if not can_approve and version.status == models.STATUS_WAITING:
         newstatus = models.STATUS_UNREVIEWED
 
     review = CodeReview(version=version,
@@ -250,8 +250,8 @@ def submit_review_view(request, obj):
             return HttpResponseForbidden()
 
         review.new_status = newstatus
-        obj.status = newstatus
-        obj.save()
+        version.status = newstatus
+        version.save()
 
     review.save()
 



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]