@@ -19,11 +19,6 @@ ENABLE_AUTOMODERATION = getattr(settings, "GATEKEEPER_ENABLE_AUTOMODERATION", Fa DEFAULT_STATUS = getattr(settings, "GATEKEEPER_DEFAULT_STATUS", 0) MODERATOR_LIST = getattr(settings, "GATEKEEPER_MODERATOR_LIST", []) -APPROVED = 1 -PENDING = 0 -REJECTED = -1 -UNMODERATED = None - post_moderation = Signal(providing_args=["instance"]) def _get_automod_user(): @@ -115,16 +110,16 @@ def delete_handler(sender, **kwargs): # def approved(qs_or_obj): - return _by_status(APPROVED, qs_or_obj) + return _by_status(1, qs_or_obj) def pending(qs_or_obj): - return _by_status(PENDING, qs_or_obj) + return _by_status(0, qs_or_obj) def rejected(qs_or_obj): - return _by_status(REJECTED, qs_or_obj) + return _by_status(-1, qs_or_obj) def unmoderated(qs_or_obj): - return _by_status(UNMODERATED, qs_or_obj) + return _by_status(None, qs_or_obj) def _by_status(status, qs_or_obj): if hasattr(qs_or_obj, "model"): gatekeeper/__init__.py @@ -7,9 +7,9 @@ import datetime import gatekeeper STATUS_CHOICES = ( - (gatekeeper.APPROVED, "Approved"), - (gatekeeper.PENDING, "Pending"), - (gatekeeper.REJECTED, "Rejected"), + (1, "Approved"), + (0, "Pending"), + (-1, "Rejected"), ) class ModeratedObjectManager(models.Manager): @@ -54,7 +54,7 @@ class ModeratedObject(models.Model): gatekeeper.post_moderation.send(sender=ModeratedObject, instance=self) def approve(self, user): - self._moderate(gatekeeper.APPROVED, user) + self._moderate(1, user) def reject(self, user): - self._moderate(gatekeeper.REJECTED, user) \ No newline at end of file + self._moderate(-1, user) \ No newline at end of file gatekeeper/models.py @@ -10,17 +10,17 @@ import gatekeeper @staff_member_required def moderate(request): if request.method == 'POST': - status = gatekeeper.PENDING + status = 0 object_ids = request.POST.getlist('objects') if "_deny" in request.POST: - status = gatekeeper.REJECTED + status = -1 elif "_approve" in request.POST: - status = gatekeeper.APPROVED + status = 1 if status and object_ids: for obj_id in object_ids: - if status == gatekeeper.APPROVED: + if status == 1: ModeratedObject.objects.get(pk=obj_id).approve(request.user) - elif status == gatekeeper.REJECTED: + elif status == -1: ModeratedObject.objects.get(pk=obj_id).reject(request.user) return HttpResponseRedirect(reverse('gatekeeper_moderate_list')) @@ -32,7 +32,7 @@ def moderate_list(request, app_label=None, model=None): if content_type: content_type = ContentType.objects.get(pk=content_type) - pending = ModeratedObject.objects.filter(status=gatekeeper.PENDING) + pending = ModeratedObject.objects.filter(status=0) if content_type: pending = pending.filter(content_type=content_type) gatekeeper/views.py 6537ad41cf87b1d9c01c60422c887e23b534479a Jeremy Carbaugh jcarbaugh@gmail.com http://github.com/sunlightlabs/django-gatekeeper/commit/152a97a4bd77168ef39dd2e217c876f58095a75c 152a97a4bd77168ef39dd2e217c876f58095a75c 2009-01-07T08:13:54-08:00 2009-01-07T08:13:54-08:00 removed status constants because they didn't work like I had expected 895269225a04b6dc1d5739e5c6648ac912c8b60e Jeremy Carbaugh jcarbaugh@gmail.com