fix(simple-editor): stop seed resurrection + add promote/demote + drag substeps
Three bugs reported on 2026-05-20:
1. RESURRECTION. User deletes a substep in the Simple Editor (e.g.
Soak Clean (S-3) under Cleaner), then on the next -u fusion_plating
the substep comes back. Root cause: the recipe XML lived in the
manifest's `data` list with `noupdate="1"`. Odoo's noupdate=1 only
blocks UPDATE of existing records — when a record's ir.model.data
row is missing, the loader treats it as "not yet created" and
re-creates from XML. Every upgrade resurrected every user-deleted
seed node.
Fix: pull the recipe XML files out of `data` and load them once
via post_init_hook → _seed_starter_recipes_once. Sentinel checks
ir.model.data for each recipe's root xmlid; if present, skip
loading entirely. Result: deletions are permanent across all
future upgrades. Existing entech recipes untouched.
Files affected: fp_recipe_enp_alum_basic, fp_recipe_enp_steel_basic,
fp_recipe_enp_sp, fp_recipe_general_processing, fp_recipe_anodize,
fp_recipe_chem_conversion.
2. PROMOTE / DEMOTE. Simple Editor had no way to turn a substep into
a top-level operation, or to tuck an operation under another as a
substep. Authors had to delete + re-create. New endpoints:
* /fp/simple_recipe/step/promote → flips node_type 'step' →
'operation', re-parents to the recipe (or sub-process) root,
places right after the old parent operation.
* /fp/simple_recipe/step/demote → flips 'operation' → 'step',
re-parents under the preceding operation (or a caller-supplied
target_op_id). Blocks demoting an operation that has its own
children, with a helpful message.
UI: each row in the editor now carries an up-arrow (promote, only
shown on substeps) and a down-arrow (demote, only shown on
operations). Confirmation dialog explains what's about to happen.
3. DRAG SUBSTEPS. Last commit (2142a66b) disabled drag on substep
rows. Operators couldn't reorder substeps within an operation.
Re-enabled drag on substeps. The step_reorder endpoint now groups
incoming node_ids by parent_id and renumbers within each parent
(10, 20, 30…). Cross-parent drag still no-ops on parent change —
Promote/Demote buttons are the way to move between parents.
Drive-by:
- Added `from odoo import _` to the controller (missing import the
new endpoints surfaced).
- Edit-panel field wiring audited: all fields visible in the screen
(Step name, Default instructions, Step Type, Triggers Workflow,
Parallel Start, QA Sign-off, Collect measurements, Instruction
Images, custom prompts) persist correctly through step_write or
dedicated endpoints. No broken wires.
Tests: 15 total in TestSimpleRecipeFlatten (was 10). 5 new cover
promote happy-path, promote reject (non-substep), demote happy-path,
demote block on has_children, and reorder parent-scoping.
Module: fusion_plating 19.0.20.4.0 → 19.0.20.5.0.
Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
This commit is contained in:
@@ -30,6 +30,79 @@ def post_init_hook(env):
|
||||
_backfill_contract_review_template(env)
|
||||
_seed_rack_tags_if_empty(env)
|
||||
_migrate_legacy_uom_columns(env)
|
||||
_seed_starter_recipes_once(env)
|
||||
|
||||
|
||||
def _seed_starter_recipes_once(env):
|
||||
"""Load starter recipe XML files on FIRST install only.
|
||||
|
||||
Before 19.0.20.5.0 the recipe XML files (ENP-STEEL-BASIC, ENP-SP,
|
||||
ENP-ALUM-BASIC, etc.) lived in the manifest's ``data`` list. With
|
||||
``noupdate="1"`` we expected user edits / deletions to survive
|
||||
module upgrades — but Odoo only treats noupdate=1 as "don't update
|
||||
existing records". If a record's ir.model.data row is deleted via
|
||||
unlink, Odoo on the next ``-u`` sees the xmlid as missing and
|
||||
RE-CREATES the record from XML. Bug reported 2026-05-20: every
|
||||
time the user deleted a substep from a starter recipe, the next
|
||||
upgrade brought it back.
|
||||
|
||||
Fix: pull those files out of the manifest's data list, load them
|
||||
here via convert_file ONCE per xmlid. Each file gets a sentinel
|
||||
check (does the root recipe's xmlid exist in ir.model.data?); if
|
||||
yes, skip. The hook is itself idempotent so it's safe to run on
|
||||
every upgrade as well — but the sentinel ensures recipe content
|
||||
is only seeded the very first time.
|
||||
"""
|
||||
from odoo.tools import convert
|
||||
Module = env['ir.module.module']
|
||||
mod = Module.search([('name', '=', 'fusion_plating')], limit=1)
|
||||
if not mod:
|
||||
return
|
||||
|
||||
# (xmlid_to_check, data_file_path) pairs.
|
||||
# If the xmlid already exists in ir.model.data, the file is skipped.
|
||||
sentinels = [
|
||||
('fusion_plating.recipe_enp_alum_basic',
|
||||
'data/fp_recipe_enp_alum_basic.xml'),
|
||||
('fusion_plating.recipe_enp_steel_basic',
|
||||
'data/fp_recipe_enp_steel_basic.xml'),
|
||||
('fusion_plating.recipe_enp_sp',
|
||||
'data/fp_recipe_enp_sp.xml'),
|
||||
('fusion_plating.recipe_general_processing',
|
||||
'data/fp_recipe_general_processing.xml'),
|
||||
('fusion_plating.recipe_anodize',
|
||||
'data/fp_recipe_anodize.xml'),
|
||||
('fusion_plating.recipe_chem_conversion',
|
||||
'data/fp_recipe_chem_conversion.xml'),
|
||||
]
|
||||
IMD = env['ir.model.data']
|
||||
for xmlid, filepath in sentinels:
|
||||
module_name, name = xmlid.split('.', 1)
|
||||
if IMD.search_count([('module', '=', module_name), ('name', '=', name)]):
|
||||
# Recipe already in DB (either from a previous install, or
|
||||
# already loaded by an earlier hook run). Don't touch — user
|
||||
# may have made edits.
|
||||
continue
|
||||
# File not yet loaded for this DB. Run it once.
|
||||
try:
|
||||
with open_module_data_file(filepath) as fh:
|
||||
convert.convert_file(
|
||||
env, module_name, filepath, idref={}, mode='init',
|
||||
noupdate=True,
|
||||
)
|
||||
_logger.info('Seeded starter recipe %s', xmlid)
|
||||
except FileNotFoundError:
|
||||
_logger.warning('Starter recipe file %s not found, skipping',
|
||||
filepath)
|
||||
except Exception as exc:
|
||||
_logger.warning('Could not seed %s: %s', xmlid, exc)
|
||||
|
||||
|
||||
def open_module_data_file(relpath):
|
||||
"""Open a file relative to the fusion_plating module root."""
|
||||
import os
|
||||
here = os.path.dirname(__file__)
|
||||
return open(os.path.join(here, relpath), 'rb')
|
||||
|
||||
|
||||
def _resolve_kind_id(env, code):
|
||||
|
||||
Reference in New Issue
Block a user