From 658349a699b1e1a7c713b681696b77ee39a45dfe Mon Sep 17 00:00:00 2001 From: Uma <uma.s@vtiger.com> Date: Fri, 26 Jun 2020 17:31:49 +0530 Subject: [PATCH] Fixes #1321 File Preview is Comments is supported --- modules/Vtiger/models/Record.php | 9 +++++++++ packages/vtiger/optional/ModComments.zip | Bin 38721 -> 38734 bytes .../v7/modules/ModComments/FilePreview.tpl | 2 +- .../modules/ModComments/views/FilePreview.php | 11 +++++------ 4 files changed, 15 insertions(+), 7 deletions(-) diff --git a/modules/Vtiger/models/Record.php b/modules/Vtiger/models/Record.php index 99dd3d430..8e52a78ea 100644 --- a/modules/Vtiger/models/Record.php +++ b/modules/Vtiger/models/Record.php @@ -741,5 +741,14 @@ class Vtiger_Record_Model extends Vtiger_Base_Model { return array_merge($relatedModuleRecordIds, $directrelatedModuleRecordIds, $indirectrelatedModuleRecordIds); } + + function getDownloadFileURL() { + $fileDetails = $this->getFileDetails(); + if (!empty($fileDetails)) { + return 'index.php?module='. $this->getModuleName() .'&action=DownloadFile&record='. $this->getId() .'&fileid='. $fileDetails['attachmentsid'].'&name='. $fileDetails['name']; + } else { + return $this->get('filename'); + } + } } diff --git a/packages/vtiger/optional/ModComments.zip b/packages/vtiger/optional/ModComments.zip index 1145c2fead8c7fb6fa2b10fecba4e952ac72e421..3838ff0e222876097ab0b39b93c00410814d9f93 100644 GIT binary patch delta 4426 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 delta 4310 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 RaQN#&Hj|D_GU`yle*oBTr|bX# diff --git a/pkg/vtiger/modules/ModComments/layouts/v7/modules/ModComments/FilePreview.tpl b/pkg/vtiger/modules/ModComments/layouts/v7/modules/ModComments/FilePreview.tpl index ae89e62f2..c11c208a7 100644 --- a/pkg/vtiger/modules/ModComments/layouts/v7/modules/ModComments/FilePreview.tpl +++ b/pkg/vtiger/modules/ModComments/layouts/v7/modules/ModComments/FilePreview.tpl @@ -52,7 +52,7 @@ {else if $OPENDOCUMENT_FILE_TYPE eq 'yes'} <iframe id="viewer" src="libraries/jquery/Viewer.js/#../../../{$DOWNLOAD_URL}" width="100%" height="100%" allowfullscreen webkitallowfullscreen></iframe> {else if $PDF_FILE_TYPE eq 'yes'} - <iframe id='viewer' src="libraries/jquery/pdfjs/web/viewer.html?file={$SITE_URL}/{$FILE_PATH}" height="100%" width="100%"></iframe> + <iframe id='viewer' src="libraries/jquery/pdfjs/web/viewer.html?file={$SITE_URL}/{$DOWNLOAD_URL|escape:'url'}" height="100%" width="100%"></iframe> {else if $IMAGE_FILE_TYPE eq 'yes'} <div style="overflow:auto;height:100%;width:100%;float:left;background-image: url({$DOWNLOAD_URL});background-color: #EEEEEE;background-position: center 25%;background-repeat: no-repeat;display: block; background-size: contain;"></div> {else if $AUDIO_FILE_TYPE eq 'yes'} diff --git a/pkg/vtiger/modules/ModComments/modules/ModComments/views/FilePreview.php b/pkg/vtiger/modules/ModComments/modules/ModComments/views/FilePreview.php index 79081deae..1c8d08c18 100644 --- a/pkg/vtiger/modules/ModComments/modules/ModComments/views/FilePreview.php +++ b/pkg/vtiger/modules/ModComments/modules/ModComments/views/FilePreview.php @@ -48,7 +48,7 @@ class ModComments_FilePreview_View extends Vtiger_IndexAjax_View { } } - $path = $fileDetails['path'].$fileDetails['attachmentsid'].'_'.$fileDetails['name']; + $path = $fileDetails['path'].$fileDetails['attachmentsid'].'_'.$storedFileName; $type = $fileDetails['type']; $contents = $fileContent; $filename = $fileDetails['name']; @@ -56,11 +56,10 @@ class ModComments_FilePreview_View extends Vtiger_IndexAjax_View { if ($recordModel->get('filename')) { $fileDetails = $recordModel->getFileNameAndDownloadURL($recordId, $attachmentId); } - - if (is_array($fileDetails[0])) { - $downloadUrl = $fileDetails[0]['url']; - $trimmedFileName = $fileDetails[0]['trimmedFileName']; - } + if ($recordModel->get('filename')) { + $downloadUrl = $recordModel->getDownloadFileURL(); + $trimmedFileName = $fileDetails[0]['trimmedFileName']; + } //support for plain/text document $extn = 'txt'; -- GitLab