Skip to content

fix: admin 前端显示 merged 状态的 objectives#5

Open
Roganic wants to merge 2 commits into
mainfrom
fix/admin-merged-status
Open

fix: admin 前端显示 merged 状态的 objectives#5
Roganic wants to merge 2 commits into
mainfrom
fix/admin-merged-status

Conversation

@Roganic
Copy link
Copy Markdown
Owner

@Roganic Roganic commented Apr 15, 2026

问题

Objective.status 类型定义和 OBJ_STATUS_ORDER 数组都缺少 merged,导致所有已合并的 objectives 在看板中不可见,只显示 3 个(needs_review + done),而实际有 116 个。

修复

  • Objective.status 类型加入 "merged"
  • OBJ_STATUS_ORDER 加入 "merged"
  • 重新构建前端 dist

🤖 Generated with Claude Code

Roganic and others added 2 commits April 6, 2026 13:07
Objective.status 类型和 OBJ_STATUS_ORDER 缺少 merged,
导致所有已合并的 objectives 在看板中不可见。

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
Copy link
Copy Markdown

@chatgpt-codex-connector chatgpt-codex-connector Bot left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

💡 Codex Review

Here are some automated review suggestions for this pull request.

Reviewed commit: 8d6d75c336

ℹ️ About Codex in GitHub

Your team has set up Codex to review pull requests in this repo. Reviews are triggered when you

  • Open a pull request for review
  • Mark a draft as ready
  • Comment "@codex review".

If Codex has suggestions, it will comment; otherwise it will react with 👍.

Codex can also answer questions or update the PR. Try commenting "@codex address that feedback".

Comment thread paddock/db.py
enabled=excluded.enabled, updated_at=excluded.updated_at
""", (
p["id"], p["name"], p["repo_root"], p["worktrees_root"],
p.get("base_branch", "main"),
Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

P1 Badge Preserve base_branch on project updates

upsert_project now writes base_branch as p.get("base_branch", "main"), which silently resets projects configured for non-main branches whenever an update payload omits this field (for example, legacy clients calling PUT /api/v2/projects/{id} without the new property). Once reset, supervisor merge/diff logic runs against the wrong branch and can mis-handle merge state. Please keep the existing stored base_branch when the caller does not explicitly provide one.

Useful? React with 👍 / 👎.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant