fix: 拖选文字时弹窗不再误关闭 #27

Merged
hera merged 16 commits from fix/next-batch into main 2026-04-12 14:11:46 +00:00
Showing only changes of commit 6752b27f99 - Show all commits

View File

@@ -1644,11 +1644,14 @@ def my_contribution(user=Depends(get_current_user)):
(f'%"from_user": "{display}"%',)
).fetchall()
adopted_names = list(set(r["target_name"] for r in adopted_rows if r["target_name"]))
# pending: recipes still owned by user in public library
pending_rows = conn.execute(
"SELECT name FROM recipes WHERE owner_id = ?", (user["id"],)
).fetchall()
pending_names = [r["name"] for r in pending_rows]
# pending: recipes still owned by user in public library (skip admin — admin owns all public recipes)
if user.get("role") == "admin":
pending_names = []
else:
pending_rows = conn.execute(
"SELECT name FROM recipes WHERE owner_id = ?", (user["id"],)
).fetchall()
pending_names = [r["name"] for r in pending_rows]
# rejected: unique recipe names rejected (not already adopted or pending)
rejected_rows = conn.execute(
"SELECT DISTINCT target_name FROM audit_log WHERE action = 'reject_recipe' AND detail LIKE ?",