fix: filter deleted tasks/list items from focus, redirect task delete to list
Focus query now excludes soft-deleted tasks and list items. Task delete redirects to /tasks instead of back to the (now deleted) task's edit page. Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
This commit is contained in:
@@ -59,6 +59,8 @@ async def focus_view(
|
|||||||
LEFT JOIN domains ld ON l.domain_id = ld.id
|
LEFT JOIN domains ld ON l.domain_id = ld.id
|
||||||
LEFT JOIN areas la ON l.area_id = la.id
|
LEFT JOIN areas la ON l.area_id = la.id
|
||||||
WHERE df.focus_date = :target_date AND df.is_deleted = false
|
WHERE df.focus_date = :target_date AND df.is_deleted = false
|
||||||
|
AND (t.id IS NULL OR t.is_deleted = false)
|
||||||
|
AND (li.id IS NULL OR li.is_deleted = false)
|
||||||
ORDER BY df.sort_order, df.created_at
|
ORDER BY df.sort_order, df.created_at
|
||||||
"""), {"target_date": target_date})
|
"""), {"target_date": target_date})
|
||||||
items = [dict(r._mapping) for r in result]
|
items = [dict(r._mapping) for r in result]
|
||||||
|
|||||||
@@ -427,8 +427,7 @@ async def toggle_task(task_id: str, request: Request, db: AsyncSession = Depends
|
|||||||
async def delete_task(task_id: str, request: Request, db: AsyncSession = Depends(get_db)):
|
async def delete_task(task_id: str, request: Request, db: AsyncSession = Depends(get_db)):
|
||||||
repo = BaseRepository("tasks", db)
|
repo = BaseRepository("tasks", db)
|
||||||
await repo.soft_delete(task_id)
|
await repo.soft_delete(task_id)
|
||||||
referer = request.headers.get("referer", "/tasks")
|
return RedirectResponse(url="/tasks", status_code=303)
|
||||||
return RedirectResponse(url=referer, status_code=303)
|
|
||||||
|
|
||||||
|
|
||||||
# Quick add from any task list
|
# Quick add from any task list
|
||||||
|
|||||||
Reference in New Issue
Block a user