Fixed typo moderatated_by - moderated_by. Thank you Jon.

dominno · Mar 13, 2010 · bd14749 · bd14749
1 parent f835fba
commit bd14749
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 14 deletions.
diff --git a/src/moderation/admin.py b/src/moderation/admin.py
@@ -11,14 +11,14 @@
 
 def approve_objects(modeladmin, request, queryset):
     for obj in queryset:
-        obj.approve(moderatated_by=request.user)
+        obj.approve(moderated_by=request.user)
 
 approve_objects.short_description = "Approve selected moderated objects"
 
 
 def reject_objects(modeladmin, request, queryset):
     for obj in queryset:
-        obj.reject(moderatated_by=request.user)
+        obj.reject(moderated_by=request.user)
 
 reject_objects.short_description = "Reject selected moderated objects"
 
@@ -79,7 +79,7 @@ class Meta:
 class ModeratedObjectAdmin(admin.ModelAdmin):
     date_hierarchy = 'date_created'
     list_display = ('content_object', 'content_type', 'date_created', 
-                    'moderation_status', 'moderatated_by', 'moderation_date')
+                    'moderation_status', 'moderated_by', 'moderation_date')
     list_filter = ['content_type', 'moderation_status']
     change_form_template = 'moderation/moderate_object.html'
     change_list_template = 'moderation/moderated_objects_list.html'

diff --git a/src/moderation/models.py b/src/moderation/models.py
@@ -44,8 +44,8 @@ class ModeratedObject(models.Model):
     moderation_status = models.SmallIntegerField(choices=STATUS_CHOICES,
                                             default=MODERATION_STATUS_PENDING,
                                                  editable=False)
-    moderatated_by = models.ForeignKey(User, blank=True, null=True, 
-                            editable=False, related_name='moderatated_by_set')
+    moderated_by = models.ForeignKey(User, blank=True, null=True, 
+                            editable=False, related_name='moderated_by_set')
     moderation_date = models.DateTimeField(editable=False, blank=True, 
                                            null=True)
     moderation_reason = models.TextField(blank=True, null=True)
@@ -90,10 +90,10 @@ def notification(self):
 
         return ModerationNotification(moderated_object=self)
 
-    def _moderate(self, status, moderatated_by, reason):
+    def _moderate(self, status, moderated_by, reason):
         self.moderation_status = status
         self.moderation_date = datetime.datetime.now()
-        self.moderatated_by = moderatated_by
+        self.moderated_by = moderated_by
         self.moderation_reason = reason
         self.save()
 
@@ -109,22 +109,22 @@ def _is_not_equal_instance(self, instance):
         else:
             return False
 
-    def approve(self, moderatated_by, reason=None):
+    def approve(self, moderated_by, reason=None):
         pre_moderation.send(sender=self.content_object.__class__,
                             instance=self.changed_object,
                             status=MODERATION_STATUS_APPROVED)
 
-        self._moderate(MODERATION_STATUS_APPROVED, moderatated_by, reason)
+        self._moderate(MODERATION_STATUS_APPROVED, moderated_by, reason)
 
         post_moderation.send(sender=self.content_object.__class__,
                             instance=self.content_object,
                             status=MODERATION_STATUS_APPROVED)
 
-    def reject(self, moderatated_by, reason=None):
+    def reject(self, moderated_by, reason=None):
         pre_moderation.send(sender=self.content_object.__class__,
                             instance=self.changed_object,
                             status=MODERATION_STATUS_REJECTED)
-        self._moderate(MODERATION_STATUS_REJECTED, moderatated_by, reason)
+        self._moderate(MODERATION_STATUS_REJECTED, moderated_by, reason)
         post_moderation.send(sender=self.content_object.__class__,
                             instance=self.content_object,
                             status=MODERATION_STATUS_REJECTED)
diff --git a/src/moderation/tests/test_forms.py b/src/moderation/tests/test_forms.py
@@ -44,7 +44,7 @@ def test_if_form_is_initialized_existing_object(self):
                     user=self.user)
         profile.save()
 
-        profile.moderated_object.approve(moderatated_by=self.user)
+        profile.moderated_object.approve(moderated_by=self.user)
 
         profile.description = u"Changed description"
         profile.save()

diff --git a/src/moderation/tests/test_models.py b/src/moderation/tests/test_models.py
@@ -139,7 +139,7 @@ def test_moderate(self):
 
         self.assertEqual(moderated_object.moderation_status,
                          MODERATION_STATUS_APPROVED)
-        self.assertEqual(moderated_object.moderatated_by, self.user)
+        self.assertEqual(moderated_object.moderated_by, self.user)
         self.assertEqual(moderated_object.moderation_reason, "Reason")
 
     def test_approve_moderated_object(self):
@@ -150,7 +150,7 @@ def test_approve_moderated_object(self):
 
         moderated_object.save()
 
-        moderated_object.approve(moderatated_by=self.user)
+        moderated_object.approve(moderated_by=self.user)
 
         user_profile = UserProfile.objects.get(user__username='moderator')