job => task

Author: cunla

scheduler/admin/old_task_models.py

@@ -175,8 +175,8 @@ class TaskAdmin(admin.ModelAdmin):
     def link_new_task(self, o: BaseTask) -> Optional[str]:
         if o.new_task_id is None:
             return None
-        url = reverse(f"admin:scheduler_task_change", args=[o.new_task_id, ])
-        html = format_html(f"""<a href="{url}">{o.new_task_id}</a>""")
+        url = reverse(f"admin:scheduler_task_change", args=[o.new_task_id.id, ])
+        html = format_html(f"""<a href="{url}">{o.new_task_id.id}</a>""")
         return html
 
     def has_add_permission(self, request: HttpRequest) -> bool:
@@ -239,7 +239,7 @@ def delete_model(self, request, obj):
     @admin.action(description=_("Migrate to new Task model(s)"), permissions=("change",))
     def migrate_selected(self, request, queryset):
         rows_updated = 0
-        for obj in queryset.filter(enabled=True).iterator():
+        for obj in queryset.iterator():
             migrate_util.migrate(obj)
             rows_updated += 1
 

scheduler/models/migrate_util.py

@@ -84,7 +84,7 @@ def create_task_from_dict(task_dict: Dict[str, Any], recreate: bool) -> Optional
 def migrate(old: BaseTask) -> Optional[Task]:
     old_task_dict = old.to_dict()
     new_task = create_task_from_dict(old_task_dict, old_task_dict.get("new_task_id") is not None)
-    old.new_task_id = new_task.id
+    old.new_task_id = new_task
     old.enabled = False
     old.save()
     return new_task