From f36ffbe949d065296d4d96cb7efc4f44ee89de4d Mon Sep 17 00:00:00 2001 From: GuiLeme Date: Fri, 16 Jun 2023 09:24:50 -0300 Subject: [PATCH] [I-18101-back-end] - back-end portion --- .../MakePresentationDownloadReqMsgHdlr.scala | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/presentationpod/MakePresentationDownloadReqMsgHdlr.scala b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/presentationpod/MakePresentationDownloadReqMsgHdlr.scala index e37917ec51..718b111bee 100644 --- a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/presentationpod/MakePresentationDownloadReqMsgHdlr.scala +++ b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/presentationpod/MakePresentationDownloadReqMsgHdlr.scala @@ -146,10 +146,9 @@ trait MakePresentationDownloadReqMsgHdlr extends RightsManagementTrait { val exportJob: ExportJob = new ExportJob(jobId, JobTypes.DOWNLOAD, "annotated_slides", presId, presLocation, allPages, pagesRange, meetingId, ""); val storeAnnotationPages: List[PresentationPageForExport] = getPresentationPagesForExport(pagesRange, pageCount, presId, currentPres, liveMeeting); - val annotationCount: Int = storeAnnotationPages.map(_.annotations.size).sum val isOriginalPresentationType = m.body.typeOfExport == "Original" - if (!isOriginalPresentationType && annotationCount > 0) { + if (!isOriginalPresentationType) { // Send Export Job to Redis val job = buildStoreExportJobInRedisSysMsg(exportJob, liveMeeting) bus.outGW.send(job) @@ -157,9 +156,7 @@ trait MakePresentationDownloadReqMsgHdlr extends RightsManagementTrait { // Send Annotations to Redis val annotations = StoredAnnotations(jobId, presId, storeAnnotationPages) bus.outGW.send(buildStoreAnnotationsInRedisSysMsg(annotations, liveMeeting)) - } else if (!isOriginalPresentationType && annotationCount == 0) { - log.error("There are no annotations for presentation with Id {}... Ignoring", presId) - } else if (isOriginalPresentationType) { + } else { // Return existing uploaded file directly val convertedFileName = currentPres.get.filenameConverted val filename = if (convertedFileName == "") currentPres.get.name else convertedFileName