[extensions-web] Fix signals



commit e8b23e00c0f3acce7e6c2609d17eb831215c3586
Author: Jasper St. Pierre <jstpierre mecheye net>
Date:   Mon Oct 31 20:02:31 2011 -0400

    Fix signals

 sweettooth/errorreports/models.py |    2 +-
 sweettooth/errorreports/views.py  |    5 +++--
 sweettooth/extensions/models.py   |    4 ++--
 sweettooth/extensions/views.py    |    4 ++--
 sweettooth/review/views.py        |    7 ++++---
 5 files changed, 12 insertions(+), 10 deletions(-)
---
diff --git a/sweettooth/errorreports/models.py b/sweettooth/errorreports/models.py
index 4e12856..1dc9e38 100644
--- a/sweettooth/errorreports/models.py
+++ b/sweettooth/errorreports/models.py
@@ -10,4 +10,4 @@ class ErrorReport(models.Model):
     version = models.ForeignKey(ExtensionVersion)
     can_contact = models.BooleanField()
 
-error_reported = Signal(providing_args=["version", "report"])
+error_reported = Signal(providing_args=["request", "version", "report"])
diff --git a/sweettooth/errorreports/views.py b/sweettooth/errorreports/views.py
index 01de793..5ece941 100644
--- a/sweettooth/errorreports/views.py
+++ b/sweettooth/errorreports/views.py
@@ -26,7 +26,8 @@ def report_error_view(request, obj):
 
         if form.is_valid():
             report = form.save(request=request, version=version)
-            error_reported.send(sender=request, version=version, report=report)
+            error_reported.send(sender=request, request=request,
+                                version=version, report=report)
 
             messages.info(request, "Thank you for your error report!")
 
@@ -48,7 +49,7 @@ def view_error_report_view(request, obj):
     return render(request, 'errorreports/view.html', dict(report=obj))
 
 
-def send_email_on_error_reported(request, version, report, **kwargs):
+def send_email_on_error_reported(sender, request, version, report, **kwargs):
     extension = version.extension
 
     url = request.build_absolute_uri(reverse('errorreports-view',
diff --git a/sweettooth/extensions/models.py b/sweettooth/extensions/models.py
index d04260f..46e8953 100644
--- a/sweettooth/extensions/models.py
+++ b/sweettooth/extensions/models.py
@@ -316,6 +316,6 @@ class ExtensionVersion(models.Model):
     def get_status_class(self):
         return STATUSES[self.status].lower()
 
-submitted_for_review = Signal(providing_args=["version"])
-reviewed = Signal(providing_args=["version", "review"])
+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/views.py b/sweettooth/extensions/views.py
index 87d1447..90ff84d 100644
--- a/sweettooth/extensions/views.py
+++ b/sweettooth/extensions/views.py
@@ -116,7 +116,7 @@ def ajax_submit_and_lock_view(request, obj):
     obj.status = models.STATUS_LOCKED
     obj.save()
 
-    models.submitted_for_review.send(sender=request, version=obj)
+    models.submitted_for_review.send(sender=request, request=request, version=obj)
 
 @ajax_view
 @post_only_view
@@ -209,7 +209,7 @@ def upload_file(request, pk):
                 if pk is not None:
                     return redirect('extensions-upload-file', pk=pk)
                 else:
-                    return redirect('extensions-upload-file')
+                   return redirect('extensions-upload-file')
 
             existing = models.Extension.objects.filter(uuid=uuid)
             if pk is None and existing.exists():
diff --git a/sweettooth/review/views.py b/sweettooth/review/views.py
index 12e8228..a79b63b 100644
--- a/sweettooth/review/views.py
+++ b/sweettooth/review/views.py
@@ -123,7 +123,8 @@ def submit_review_view(request, obj):
 
             models.status_changed.send(sender=request, version=obj, log=log)
 
-    models.reviewed.send(sender=request, version=version, review=review)
+    models.reviewed.send(sender=request, request=request,
+                         version=version, review=review)
 
     return redirect('review-list')
 
@@ -152,7 +153,7 @@ def review_version_view(request, obj):
 
     return render(request, template_name, context)
 
-def send_email_on_submitted(request, version, **kwargs):
+def send_email_on_submitted(sender, request, version, **kwargs):
     extension = version.extension
 
     url = request.build_absolute_uri(reverse('review-version',
@@ -177,7 +178,7 @@ def send_email_on_submitted(request, version, **kwargs):
 
 models.submitted_for_review.connect(send_email_on_submitted)
 
-def send_email_on_reviewed(request, version, review, **kwargs):
+def send_email_on_reviewed(sender, request, version, review, **kwargs):
     extension = version.extension
 
     if review.reviewer == extension.creator:



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