From e0f974d804a96dbe359c3be57cf001963721b073 Mon Sep 17 00:00:00 2001 From: PraveenMathew92 Date: Wed, 17 May 2023 17:29:26 -0700 Subject: [PATCH] + (Group) Fixed issue of Group Attendance Detail block not downloading attendance rosters from certain Storage Providers. (Fixes #5424) --- Rock.Blocks/Group/GroupAttendanceDetail.cs | 5 ----- RockWeb/Blocks/Groups/GroupAttendanceDetail.ascx.cs | 5 ----- 2 files changed, 10 deletions(-) diff --git a/Rock.Blocks/Group/GroupAttendanceDetail.cs b/Rock.Blocks/Group/GroupAttendanceDetail.cs index df4dae38025..44d38b4c9ca 100644 --- a/Rock.Blocks/Group/GroupAttendanceDetail.cs +++ b/Rock.Blocks/Group/GroupAttendanceDetail.cs @@ -676,11 +676,6 @@ public BlockActionResult PrintRoster( GroupAttendanceDetailPrintRosterRequestBag var outputBinaryFileDoc = mergeTemplateType.CreateDocument( mergeTemplate, mergeObjectList, mergeFields ); - // Set the name of the output doc. - outputBinaryFileDoc = new BinaryFileService( rockContext ).Get( outputBinaryFileDoc.Id ); - outputBinaryFileDoc.FileName = occurrenceData.Group.Name + " Attendance Roster" + Path.GetExtension( outputBinaryFileDoc.FileName ?? string.Empty ) ?? ".docx"; - rockContext.SaveChanges(); - if ( mergeTemplateType.Exceptions != null && mergeTemplateType.Exceptions.Any() ) { if ( mergeTemplateType.Exceptions.Count == 1 ) diff --git a/RockWeb/Blocks/Groups/GroupAttendanceDetail.ascx.cs b/RockWeb/Blocks/Groups/GroupAttendanceDetail.ascx.cs index 6b5efabc0e3..ba22bef4686 100644 --- a/RockWeb/Blocks/Groups/GroupAttendanceDetail.ascx.cs +++ b/RockWeb/Blocks/Groups/GroupAttendanceDetail.ascx.cs @@ -447,11 +447,6 @@ protected void lbPrintAttendanceRoster_Click( object sender, EventArgs e ) outputBinaryFileDoc = mergeTemplateType.CreateDocument( mergeTemplate, mergeObjectList, mergeFields ); - // Set the name of the output doc - outputBinaryFileDoc = new BinaryFileService( rockContext ).Get( outputBinaryFileDoc.Id ); - outputBinaryFileDoc.FileName = _group.Name + " Attendance Roster" + Path.GetExtension( outputBinaryFileDoc.FileName ?? string.Empty ) ?? ".docx"; - rockContext.SaveChanges(); - if ( mergeTemplateType.Exceptions != null && mergeTemplateType.Exceptions.Any() ) { if ( mergeTemplateType.Exceptions.Count == 1 )