From e6305da080cbe472b8274b91cd0e2eed2b02314e Mon Sep 17 00:00:00 2001 From: ethan-sparkdevnetwork Date: Mon, 27 Mar 2023 13:06:25 -0700 Subject: [PATCH] + (Workflow) Fixed issue in the WorkflowEntry block where the "Cancel" button on a WorkflowForm doesn't do anything without an "Activate Activity" assigned to it. (Fixes #5357) --- RockWeb/Blocks/WorkFlow/WorkflowEntry.ascx.cs | 7 ------- 1 file changed, 7 deletions(-) diff --git a/RockWeb/Blocks/WorkFlow/WorkflowEntry.ascx.cs b/RockWeb/Blocks/WorkFlow/WorkflowEntry.ascx.cs index 8c79322c732..cbaa6920d94 100644 --- a/RockWeb/Blocks/WorkFlow/WorkflowEntry.ascx.cs +++ b/RockWeb/Blocks/WorkFlow/WorkflowEntry.ascx.cs @@ -386,13 +386,6 @@ public void RaisePostBackEvent( string eventArgument ) */ var formUserActions = WorkflowActionFormUserAction.FromUriEncodedString( _actionType.WorkflowForm.Actions ); var formUserAction = formUserActions.FirstOrDefault( x => x.ActionName == eventArgument ); - var hasActivateActivity = formUserAction != null && formUserAction.ActivateActivityTypeGuid != string.Empty; - - if ( formUserAction != null && !formUserAction.CausesValidation && !hasActivateActivity ) - { - // Out if the action does not cause validation and does not have an Activate Activity. - return; - } if ( formUserAction != null && formUserAction.CausesValidation ) {