From d047bba79f4999dc773efe942ff2376937836e6f Mon Sep 17 00:00:00 2001 From: MaxPatyk Date: Fri, 3 Mar 2023 16:38:54 +0100 Subject: [PATCH] Fix forward when user close the window. --- .../ForwardWindow.xaml.cs | 16 ++++++++++++++++ .../WorkflowApplicationHelper.cs | 9 +++++++-- 2 files changed, 23 insertions(+), 2 deletions(-) diff --git a/src/Simplic.FileStructure.Workflow.UI/ForwardWindow.xaml.cs b/src/Simplic.FileStructure.Workflow.UI/ForwardWindow.xaml.cs index f67cd93..9dbe467 100644 --- a/src/Simplic.FileStructure.Workflow.UI/ForwardWindow.xaml.cs +++ b/src/Simplic.FileStructure.Workflow.UI/ForwardWindow.xaml.cs @@ -10,6 +10,12 @@ namespace Simplic.FileStructure.Workflow.UI /// public partial class ForwardWindow : DefaultRibbonWindow { + /// + /// Gets or sets a boolean + /// It's true when the forward window will be saved, otherwise always false. + /// + public bool IsSave { get; set; } + /// /// Create multi-itembox. /// @@ -19,5 +25,15 @@ public ForwardWindow(Dictionary dictParams) InitializeComponent(); DataContext = new ForwardViewModel(dictParams); } + + /// + /// Saves the window and set a boolean is save to true. + /// + /// + public override void OnSave(WindowSaveEventArg e) + { + IsSave = true; + base.OnSave(e); + } } } \ No newline at end of file diff --git a/src/Simplic.FileStructure.Workflow.UI/WorkflowApplicationHelper.cs b/src/Simplic.FileStructure.Workflow.UI/WorkflowApplicationHelper.cs index 711dbca..b72b736 100644 --- a/src/Simplic.FileStructure.Workflow.UI/WorkflowApplicationHelper.cs +++ b/src/Simplic.FileStructure.Workflow.UI/WorkflowApplicationHelper.cs @@ -160,7 +160,7 @@ public static GridInvokeMethodResult ForwardCopyTo(GridFunctionParameter paramet private static IList WorkflowOperationsGet(GridFunctionParameter parameter) { IList workflowOperations = new List(); - Checkout(parameter); + if (parameter.SelectedRows.Count == 0) return null; @@ -175,6 +175,9 @@ private static IList WorkflowOperationsGet(GridFunctionParame ObservableCollection itemList = null; var commentText = ""; + if (!win.IsSave) + return null; + if (windowDataContext is ForwardViewModel forwardViewModel) { itemList = forwardViewModel.MultiItemboxItems; @@ -246,13 +249,14 @@ private static IList WorkflowOperationsGet(GridFunctionParame } } } + Checkout(parameter); return workflowOperations; } private static IList WorkflowOperationsItemBoxGet(GridFunctionParameter parameter) { IList workflowOperations = new List(); - Checkout(parameter); + Guid? workflowOrganizationId = null; int targetUserId = 0; @@ -316,6 +320,7 @@ private static IList WorkflowOperationsItemBoxGet(GridFunctio Framework.Extension.InstanceDataComment.Singleton.Create(comment); } } + Checkout(parameter); return workflowOperations; }