rename cancelled_by to canceled_by

... to keep the nomenclature consistent with the `CANCELED` state.

Related: release-engineering#271

Author: kdudka

kobo/hub/migrations/0005_add_task_canceller.py

@@ -13,7 +13,7 @@ class Migration(migrations.Migration):
     operations = [
         migrations.AddField(
             model_name='task',
-            name='cancelled_by',
+            name='canceled_by',
             field=models.ForeignKey(settings.AUTH_USER_MODEL, null=True, blank=True, on_delete=models.CASCADE),
         ),
     ]

kobo/hub/models.py

@@ -578,7 +578,7 @@ class Task(models.Model):
     resubmitted_by      = models.ForeignKey(settings.AUTH_USER_MODEL, null=True, blank=True, related_name="resubmitted_by1", on_delete=models.CASCADE)
     resubmitted_from    = models.ForeignKey("self", null=True, blank=True, related_name="resubmitted_from1", on_delete=models.CASCADE)
 
-    cancelled_by        = models.ForeignKey(settings.AUTH_USER_MODEL, null=True, blank=True, on_delete=models.CASCADE)
+    canceled_by         = models.ForeignKey(settings.AUTH_USER_MODEL, null=True, blank=True, on_delete=models.CASCADE)
 
     subtask_count       = models.PositiveIntegerField(default=0, help_text=_("Subtask count.<br />This is a generated field."))
 
@@ -897,7 +897,7 @@ def cancel_task(self, user=None, recursive=True):
 
         try:
             self.__lock(self.worker_id, new_state=TASK_STATES["CANCELED"], initial_states=(TASK_STATES["FREE"], TASK_STATES["ASSIGNED"], TASK_STATES["OPEN"], TASK_STATES["CREATED"]))
-            self.cancelled_by = user
+            self.canceled_by = user
             self.save()
         except (MultipleObjectsReturned, ObjectDoesNotExist):
             raise Exception("Cannot cancel task %d, state is %s" % (self.id, self.get_state_display()))

kobo/hub/templates/task/detail.html

@@ -30,8 +30,8 @@ <h3>{% trans 'Details' %}</h3>
   {% if task.state == "CANCELED" %}
   <tr>
     <th>{% trans "Cancelled by" %}</th>
-    {% if task.cancelled_by %}
-      <td>{{ task.cancelled_by }}</td>
+    {% if task.canceled_by %}
+      <td>{{ task.canceled_by }}</td>
     {% else %}
       <td>Unavailable</td>
     {% endif %}

tests/test_models.py

@@ -1247,7 +1247,7 @@ def test_cancel_task(self):
 
         task = Task.objects.get(id=task.id)
         self.assertEqual(task.state, TASK_STATES['CANCELED'])
-        self.assertEqual(task.cancelled_by, self._user)
+        self.assertEqual(task.canceled_by, self._user)
 
     def test_interrupt_task(self):
         task = Task.objects.create(