From cfe08741e9d51f6d9b4695a119f722ec20f11a52 Mon Sep 17 00:00:00 2001 From: ethan-sparkdevnetwork Date: Tue, 16 May 2023 16:06:50 -0700 Subject: [PATCH] - (Event) Fixed issue in Obsidian RegistrationEntry where a full event would display the wait list message when making edits or completing a registration after moving off the wait list. --- Rock.Blocks/Event/RegistrationEntry.cs | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/Rock.Blocks/Event/RegistrationEntry.cs b/Rock.Blocks/Event/RegistrationEntry.cs index e0cbff3f078..2a07c1b7fa9 100644 --- a/Rock.Blocks/Event/RegistrationEntry.cs +++ b/Rock.Blocks/Event/RegistrationEntry.cs @@ -2646,6 +2646,9 @@ RegistrationGuid argument. var startAtBeginning = !isExistingRegistration || ( allowExternalRegistrationUpdates && PageParameter( PageParameterKey.StartAtBeginning ).AsBoolean() ); + // Adjust the spots remaining if this is an existing registration. Add to the Spots remaining the number of registrants that are not on the waitlist. + var adjustedSpotsRemaining = isExistingRegistration ? context.SpotsRemaining + session.Registrants.Where( r => r.IsOnWaitList == false ).Count() : context.SpotsRemaining; + var viewModel = new RegistrationEntryBlockViewModel { RegistrationAttributesStart = beforeAttributes, @@ -2671,7 +2674,7 @@ RegistrationGuid argument. Settings = financialGatewayComponent?.GetObsidianControlSettings( financialGateway, null ) ?? new object() }, IsRedirectGateway = isRedirectGateway, - SpotsRemaining = context.SpotsRemaining, + SpotsRemaining = adjustedSpotsRemaining, WaitListEnabled = context.RegistrationSettings.IsWaitListEnabled, InstanceName = context.RegistrationSettings.Name, PluralRegistrationTerm = pluralRegistrationTerm,