diff options
| author | 魏曹先生 <1992414357@qq.com> | 2026-01-05 15:10:18 +0800 |
|---|---|---|
| committer | 魏曹先生 <1992414357@qq.com> | 2026-01-05 15:10:18 +0800 |
| commit | b4661072366c4dcc63e914f2ec8625ad73b14645 (patch) | |
| tree | a7883ccca153c062e79d9ebb8a27a6521b112de3 /crates/vcs_actions/src/actions/sheet_actions.rs | |
| parent | 38b6f1c11066e30cb0e78d0f7630cf3d85985864 (diff) | |
Add RejectAll mode for share merging and fix share ID trimming
- Add ShareMergeMode::RejectAll variant to reject all incoming shares
- Trim server suffix from share IDs when updating local sheet info
- Sign vault as modified after successful share mapping merge
- Fix get_current_sheet_name call to use correct parameter value
Diffstat (limited to 'crates/vcs_actions/src/actions/sheet_actions.rs')
| -rw-r--r-- | crates/vcs_actions/src/actions/sheet_actions.rs | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/crates/vcs_actions/src/actions/sheet_actions.rs b/crates/vcs_actions/src/actions/sheet_actions.rs index 759c275..7c63a2f 100644 --- a/crates/vcs_actions/src/actions/sheet_actions.rs +++ b/crates/vcs_actions/src/actions/sheet_actions.rs @@ -400,7 +400,7 @@ pub async fn share_mapping_action( // Check sheet let sheet_name = args.from_sheet.unwrap_or( - get_current_sheet_name(&ctx, instance, &member_id, false) + get_current_sheet_name(&ctx, instance, &member_id, true) .await? .0, ); @@ -569,6 +569,12 @@ pub async fn merge_share_mapping_action( .await .read::<MergeShareMappingActionResult>() .await?; + match result { + MergeShareMappingActionResult::Success => { + sign_vault_modified(true).await; + } + _ => {} + } return Ok(result); } |
