huskies: merge 960
This commit is contained in:
@@ -276,10 +276,12 @@ pub fn write_item(
|
||||
JsonValue::String(s) if !s.is_empty() => Some(s),
|
||||
_ => None,
|
||||
};
|
||||
// Storage seam: convert the old raw CRDT stage string to a typed Stage.
|
||||
let from_stage = old_stage.and_then(|s| Stage::from_dir(&s));
|
||||
emit_event(CrdtEvent {
|
||||
story_id: story_id.to_string(),
|
||||
from_stage: old_stage,
|
||||
to_stage: stage_str.to_string(),
|
||||
from_stage,
|
||||
to_stage: stage.clone(),
|
||||
name: current_name,
|
||||
});
|
||||
}
|
||||
@@ -333,7 +335,7 @@ pub fn write_item(
|
||||
emit_event(CrdtEvent {
|
||||
story_id: story_id.to_string(),
|
||||
from_stage: None,
|
||||
to_stage: stage_str.to_string(),
|
||||
to_stage: stage.clone(),
|
||||
name: name.map(String::from),
|
||||
});
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user