Merge origin/sub_laptop_4 into sub_laptop_3 — 본뜬키 칸 · 자재 조합 표는 sub4 판 기준
Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01RoyUwuTFiDJfvCfHpvKKzp
This commit is contained in:
@@ -213,6 +213,8 @@ def combo_edit(key: str, version: str, combo_: dict, owner: str = "") -> dict:
|
||||
was = _find(data, key)
|
||||
if store.read(FILE)[1] != version:
|
||||
raise store.StoreError(409, {"stale": [FILE]})
|
||||
if isinstance(combo_, dict): # 화면이 안 보내도 계보(본뜬키)는 남김
|
||||
combo_ = {"본뜬키": was.get("본뜬키"), **combo_}
|
||||
fixed = _clean(combo_, owner or str(was.get("소유") or OWNERS[0]), key)
|
||||
done = _write([{"op": "edit", "key": key, "row": fixed}], version)
|
||||
return {**done, "combo": _find(store.read(FILE)[0], key)}
|
||||
|
||||
Reference in New Issue
Block a user