From e0e1c116d9bf39fac44f701e604ed12c25a305af Mon Sep 17 00:00:00 2001
From: Uma <uma.s@vtiger.com>
Date: Fri, 26 Jun 2020 18:16:18 +0530
Subject: [PATCH] Fixes #1321 File Preview is Comments is supported
---
modules/Vtiger/models/Record.php | 6 +++---
packages/vtiger/optional/ModComments.zip | Bin 38734 -> 38734 bytes
.../modules/ModComments/views/FilePreview.php | 2 +-
3 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/modules/Vtiger/models/Record.php b/modules/Vtiger/models/Record.php
index 8e52a78ea..389812c11 100644
--- a/modules/Vtiger/models/Record.php
+++ b/modules/Vtiger/models/Record.php
@@ -742,10 +742,10 @@ class Vtiger_Record_Model extends Vtiger_Base_Model {
return array_merge($relatedModuleRecordIds, $directrelatedModuleRecordIds, $indirectrelatedModuleRecordIds);
}
- function getDownloadFileURL() {
- $fileDetails = $this->getFileDetails();
+ function getDownloadFileURL($attachmentId = false) {
+ $fileDetails = $this->getFileDetails($attachmentId);
if (!empty($fileDetails)) {
- return 'index.php?module='. $this->getModuleName() .'&action=DownloadFile&record='. $this->getId() .'&fileid='. $fileDetails['attachmentsid'].'&name='. $fileDetails['name'];
+ return 'index.php?module='. $this->getModuleName() .'&action=DownloadFile&record='. $this->getId() .'&fileid='. $fileDetails[0]['attachmentsid'].'&name='. $fileDetails[0]['name'];
} else {
return $this->get('filename');
}
diff --git a/packages/vtiger/optional/ModComments.zip b/packages/vtiger/optional/ModComments.zip
index 3838ff0e222876097ab0b39b93c00410814d9f93..d8bf00828de3834f7b04a685510cc41be2f81b99 100644
GIT binary patch
delta 595
zcmX@Nj_KSwrVaX@f=4Ib3SfYOeJl(NI+F{7#3#%5aZHZ)6y=`%_G=szZ?5<B*A+b7
zgHV2kpMgOWtbD^Xw#k3WM7YeJevO0R%~It|EcGi}Wmm3L4b^PE-nF^5@~h;g&{mmp
zv$~S6Q-Y`KxOz=Gk-lg3gS#yvkHtQ-o|l>PV)iNzKLw+8Ig?MBRl3KCa-KYBu%Y|z
zpGU{M-Oray=w3hL*PrsLlY05DUfaI=UH(DnXxN=?ZI2H=y7tj+@51D{=aNGX??`{g
z^j6N`>gjEFuhn1btGxd`E${yB!p7=<g-v&^^*y_;-@4L!)s-8J4zYW!&IjDz$(;V@
z=#{J5|9Q4rzxn&9#<28jlb!S3Xr4Rz0dtS<`c|eV{pH5-ibp+ckN+igggfkA?Y1=6
zD&O<9wawA!w;Pt8?wnHesj2ys&!MHI=U%526d#+paFyvLw#h4tpVwQ-@3~m<?yT74
zlNDCi-!Efzjy=eCOx|t#<9i31ryc9EweYKLmG<BJbA89Lo3Z?}{qH`!AUR{Q$lHP|
zug+U&=x9yeCim)(oxGw*^KTxV{$+Zb(i8rE%;0-DPjSl*8=e>=S3@rYkyF<jlFqJ5
zpR==gIY$noY2|{0Q4@sv??0&juh1Uut{PZc7b7$^Ey{xD@bYK&0p9E!FU)Jz8(0|_
z&hSqvlGuE)rbLJtm<lF)^amiv_hiPY3Y!o2pJL?&#W`Hh<XKalxe@XF6|9V7nj0ek
DLb)d!
delta 567
zcmX@Nj_KSwrVaX@lX;4GSog6oFz8G!3=*F#-^VdI-cxk)EF+oC6Flv71#7x*1u#It
zetrf9O|Y^J)7U2eDHGv3`siyM1aFoqXJV=EJap^&R~xO=4{C+mMAzFnH?5lRIPF-!
z-i)FPla_jT3jORU7v0l0A?Z+3*MphO!nKy7KRH~EP0ihOUG4pe)k^G^5@{tHXWzeC
zasGuNU(v_4LGnNS^lv_WTC?|f?SH;|vu||WzE)rpamVW33iFaRmj!#WB)*^das3@*
z@ZR{_xw`dlXMC^CfA(#!wD^wa^6DpY-)7W34wBfi#H-hp|H{?dpLo8`wJtao?-RTC
z>G^=&hwtg16Auo5|HSyp-lGTpGF`1)ldb<`lX`z`kNUX`gLnFE7GGb-nrh9xROuac
z|Doo+taja4za>*9i_1(&7t&i>9H-tq+xQ$$=-P>9GkoS+U$6i9p!ZmD{<axD$1d-z
zlhu`Y#Z_kT&tRAAcQ&~a!>~683tws9sd#m^-qob<b=8fUSA6Z~4$N7S(Y`pW{+MH8
zpyax*0nfkx<X9+iCq1Fkq;#S!^Xq>1Vvp}U3y;<&KA5E071*>e;NG93vqH~X6hHS9
zyup<9$)S0xf~ws9ga7~KE3EDFTJ-AA4i&AlTM8uF{Lj`i1bDM^q+IR|YhYzy*v~(y
zNMiHFni3)As-78>J^BMC-|Erce7OG<D=#RX;p!&On(EArh}*A|8K)|2=9uQj2ml$d
B76bqQ
diff --git a/pkg/vtiger/modules/ModComments/modules/ModComments/views/FilePreview.php b/pkg/vtiger/modules/ModComments/modules/ModComments/views/FilePreview.php
index 1c8d08c18..1d058387c 100644
--- a/pkg/vtiger/modules/ModComments/modules/ModComments/views/FilePreview.php
+++ b/pkg/vtiger/modules/ModComments/modules/ModComments/views/FilePreview.php
@@ -57,7 +57,7 @@ class ModComments_FilePreview_View extends Vtiger_IndexAjax_View {
$fileDetails = $recordModel->getFileNameAndDownloadURL($recordId, $attachmentId);
}
if ($recordModel->get('filename')) {
- $downloadUrl = $recordModel->getDownloadFileURL();
+ $downloadUrl = $recordModel->getDownloadFileURL($attachmentId);
$trimmedFileName = $fileDetails[0]['trimmedFileName'];
}
--
GitLab