From be13dffca11d4194d17cc3446636aed530d5544e Mon Sep 17 00:00:00 2001 From: Uma <uma.s@vtiger.com> Date: Thu, 30 Apr 2020 15:58:13 +0530 Subject: [PATCH] Fixes #1267 Record deletion will delete related emails and activites --- packages/vtiger/optional/RecycleBin.zip | Bin 36818 -> 37902 bytes .../modules/RecycleBin/models/Module.php | 23 ++++++++++++++++++ 2 files changed, 23 insertions(+) diff --git a/packages/vtiger/optional/RecycleBin.zip b/packages/vtiger/optional/RecycleBin.zip index 4f3185ef3283bd897637630d31ec42ff5729a4b0..b0e2ef16bfbf18966d9bf93820a089432ed97ab2 100644 GIT binary patch delta 8627 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 W0uMz175L8~9>9VM0Fr_s*#7~o4fzNF delta 7536 zcmbW5c|2768^@0sS!PU;eaS9avaiu%DO>i-ZR{gsoscXuq)Ce?gi+FlY`K<_y1&R0 zTBJoH38_$tauew)%kP{S%bY>iz4Lk<ukpw8p3n1qm-9TIq|1nBnFz9t1(F#BKp#hy z{npekvwu*42tdFE`h?+p@cWb<eq#ra#k{XwuL{3*4I`ofCguSo08sxdFt7{^P8b6p z=pHspx(1R;L6YJUC>~G%8vvmMPZQN#5CD+B3IId_5lYli2?0<B6bwDE*s?Dk2=a2d zuu*l8g2F=oYbIzqLbx`q9FPWBIiwit;mlAEZZHWh86I6~HUDG`XN-1Xh=xkQB_l?Q z{@?P^v;soWRl`?Kqrqh|VgmprS~Mjtel1i)C?0xXMJ!hlUV{{#t0Lp?%gz#pMcHW@ zZmvYb=y5;Auizqbf*SPa3F43jC?0y?8sx>s5uk>JEY`iW=j~(yfOIeuop}N$B~p@O zdCDcp9wr#2QM73?6x`}=8v#IVma+!Lw|p%OP(&1r;I~SltCAT26gdDub)LXR>0!n! zPhnkE!wjP|&rEhA!FsrXByBnhI-YxZN|^vFye6+mWoh3)iXtljXwXx5IhUts^G-k% z+IeSO-3?TV+`m}a3zDH^Ef7{B4*<&4Xf^1!mtIwOnN29exmEoQ+?%7LUlV%3qh1QG zEC+bH_TU2jyz%=&m56%?)bmjQ?hNRG?GDQ2!@aI^DKK7H&@tZ=<P}Ev&leVSKs|J3 z4=8lLOMZ3TF&=LrYV<m7un506+_a4i#d6zQwcx-7)Dr-J_0(8l%3#uJsEANJ^uUrY zpVGmz&Tl4&pyig}tIG}mR+0c9Jxg#q$w6L@007n4fFL0~q3NBu)2x~DoiS<2{SE$k zf96^o9Db`Pt-GzY<PTJaAa^&1x=5GN;qm_3zlI*V=<|yge0DrlpD^V%Ri)kB6*2Vg z$K95f?2%z#`(~<j3}t;Qr5iCw14Nze&264$x@0GtOz}r-y)BapdsnTMP~^PMHFi;@ zZQaSIdo;cmo``LeVUit4Qn6|PT(3Xj?fPL+{`J}jOEgOAdc8Bx5ybYZx~B|8U9a)Q zv1B#)f3_F7$sC>IS$Ic~FaDx-LQgC3^RjRxv+cAHUb7NQ0W9m|D&+2pXB|QqoFv4F zmEsD>YGsX0D*kd!UCHb!u~O+=igCx@ckN0JHP?0tirFt`Q{8oyO|RzUy^y0hs&9|% zi7VhgQ2#NTQqFIpoa7?5Pww%n$}JU_>IgiMDc1dBy@$zfJvJu|r=^Z}l4T}N<aA~j z8)DM-i>)fX?tF24Ggp%}*Jz8RS7U)o7Dnc^Co8#>N5S%M>m9~-5M!s&I}ZP}2$lcX zCN!|iIpDIQ=lJbgCVV<y@3OvsA#9i8^!RG9@0*nSe7C1BoPHYabbqaKLHahw2t<{n zRnEIf%R$c)j6s7Qk%ZA3Ow_(T>Q_r@QoL$9?a)4<L44EHYc8di@V4Z7Sp#Xn4q(ed zxS4G+B8!`}em-j|VbsvA<6bKGqV*t}J*?)TNtr=v(*3|q;Zpa+9k&9N8dtPZYbQ9w zIn}Ju#3`YHTNM{N<!<z8<_O1CN7Zw8cJ({xMpp*zJ-ge=HBU6yZi|XSsIBsb$VfBN zedm^KHHF#<oAY+I8J2i&ZWAGCAY6vB#$`fc4?iG}1wNf2KF{E&v})~q*QY!3_|KxZ z#ak;c95|c!^Of~0+>C$lg)WTE^QhWh%zLGrfRRny)?Wp@Ye)F7C3m%=-N~d4c4eDd z!p%D;j*Gc#g*e%m);nSDR|O5!cIH@{##FF0N_V)nmj^b8<eiLn=S|)EVRG!<DF2rb zrsTmYRx(T4U)Y<K4F`;gJC3&)D&QmyP7u9w6TK>*DHX<*YkCt;9m!Z5qToIfz1LKG z!jz}Nw43+1xnQ2FNkD`tp=rwd=QP`tf^EJ|=~}th!USC_6vpw4gYnDD>KUPxt#y_{ z`uLRgp*25SYpUPf{({Jh7vB^=BF68MSB8(7D9|J0yEAtN-6KC%NC;-)nwi;Wq4cmn zMb<uXN+~_)V!B&MagFx<Nm1MHOqe2zzt!y@M(}-M|JKOsU3tLg$lZ9unv`lop{Gy0 zo({Q(-D{}(R(oOnaj~tdBWDJ!*V%_fQ;<!sI5rMEcMK^hxGg~Zwu3wG>sf3oMRD}l zn46izlUTB$(ptqZbv+c<(`v!*>(vEy+G})Bb`Ir<xNskqq8~Tho-3KXIjd?QsY!ao zf48`&d1Jg>t3YWpt3s?U(=$z8=flnVz^P{Ch#2$}Y{cl=+;6cv(!BG>(vPtPv&uE4 z)}-dk5xZ+2e5${U=1#(z#&o#j2KU9+IrBAf1v8%_vxnGj>(}e(!TheEtKM{9^@Sde zP+v2td64w=BCfE=>E@4SHdX-<#mvYv${!@WFYf<a(?u?6D$(<_p7ldf(xo+CMPE{} zPxBwjvytorGF=@nKT|g-_YFo)O~}d<uIQx=_1W44Wx00_)HfDxS4lxR-)OeGqU;ob zVMFu2EFnkT&MwL_cS*P@|556UQ+D#<Ez^#xn}p?i<6kr&jE?P)-<$du7PGTTS7dBs zU9peAE)VOUtAh?iR!mDtasb&Dw=%+gJW@S6q7P>Nv7Hbj*mutMxtfrR`}g|;|2tO~ zR&^Jzz|E9ZP-s4p$2WONbihf*;Yvhl)T+|_%;Y=#2g%B<$}*=5a~sL&`8O`GpJ~4! z`Ix|z?bbHZcV%kt>+?x34t$UvK~|syZj_fcsRjAh@h3|6_Gg$M-_I&5$lT(8uRbW* zYwZ&ZQjabEhw7fpTHX90h41yfMZc?B*<&+Le&jF7whPW@S3B}}cV}qYgcZ}B^_l^# zuOCX=SnCQGk<Eisw;LT5K4DUx$tzV;m7LPRoLNR1@v?lx&X;o7@bQV=C5mn0_loZs zByxL156BNGG&~u`s}D!I{Vk_`yB#Tl(=U3(u_1O>gwuCv@#G`y;wcu@JI-w0HF*7e ztbOn;K4Cqra=rGUPaKv(k=iQ6#0T=-xjpvTIh1vX2CvQJx|m~zUsQ~C;BtRpdpZL= zB#!!`!;;NMZP1@JImh+8jPV}UA8=n}bBte|@RZ1sE==`#7xyX3uY~m2%$td@bwk?q zFBct<X+HSQ7vE3%DVpK1Jf9-`!bEE9yX{_2a}Ky@*!J8o(>dLyPZA@zp!dG8t2=c< zuOYy?n^(W+5_!01&4&(?tia;%s0g+}`4%(ly>DKAt5+gTAeG;I)7|nsqr%4Fc$0>L z`2K`)=QTxI_`H1o0#`o*?$*P^KQsjoT|0{un!e<e9+?zY+`IQYE_$D|jPFbet7lF( zpIaF7Y3JDNqDtJ5IM40CvR%XV4qCOoXvGf?+HCfiKZz0~N41NGyChvR&gr-|DOeRR zJS?JPcX34b^BueJTSp7*njNy`-(5<U5!<~Do6ye|3{=+`$YqNWS#8pLg*qC$^LZ~{ zEykPq>#DN~?c!e_`_is>GV)2%5!LfCUYn&(UPH8T>&DLnXl9|RL-R<}Cu=ih$5b9Q zrf3=oT+#nnYfbj^x@VBSK6|j^r&-oU7MxYag}CU>S8L7|X*opnHTez(73HG)2aWnJ z6K{q3mZ^Om<dZG(8VuaaRhc64D0{=8M30gKA4zSCtigv^Tk&EoqwPZGvF~+SoLUV- zaD+RVZo|(VQ{Jtu7!UvWVe32hRtamPn5j}bo_@*DT@=DNIsS;ixN{$pRiboTCsGze zB4-`=J%RW-%fiyC217AZ!}^+yXt?i06rwCcdyJD(dj%@j#qCSK6WzEQ^KsW{iTbfO zTM7(@!w2L!q7NOm(0qS><JH<e)WMKGeBWrl`rQMpe~ny``<?&T*qP604Uq&E`?PNX zB=uAjA<H6EREn&s-GS9sY(l=AzBbvOXfhPmn0rOaAo{tHPmR&rPYz{cUVK-@G-4*& zq|{}aqi;Up8ShQmde7g+I?{)!6+f;JSuAKW7{X;RRNpOw$U9{7Ne3JDdb91hpD`jg ztIpeHs0vKatXY_Q85=>QFs+YFO=A1US#O~ote#OD^#rE^+-d;WI0q0}z8h>-_l8Cb zT074uL68QZs3f!e3keR<N_Q*4hFl($Au~@vNgDX$h)Th}!SjRb;@%XEtyvhjAT<Xi z1HUJNqmqOg_{_7Y<H^$9EqZ4P$9#7S&Hn-yJDNPeA?FJ?|IZPERH%d{J%I9aDqhQ* z0Fa>(ir*7Vz=hJ!2g`K$v}J)N47H5Hfkdz#0T=)z&@*=W?F)7E!$+9nabEZkrO;q# zaN(!<B#>7EZ{CMJQx+yc2uwVPs@epu-T?^!5C;n+5-0^NHWaxy+BtB`!ZZp+Ulo+# zM}xxyftO~E=sQ!*k)@+a&TF8-fwol`T^b%hB$dJsO)XGWAzKC}8~~t=POAqLiY@C8 zn+9hNOLYJM_jxLXm!d#ohm<e9C^jSnT)AomYBL8501R^hfB=}cVyf`+dB64HWFa#l zM3FS@j3XZkB+x#bz>ER(jo!0bMXTnbbQXAwwcv#DjA=ZZSrcr|zyh&Qs!L)Q>I8SM zXfna01<b@GQAkIn$iJd2oh%znoFQn35O8y**1t~G6F|doN9b@=hwGp9G2S`cFyI3u z<?S(EBZuEW(4y-C+Efdx!01JY!a#f!+%X9nXOUwy$Dx&dvFAl!_CSaO`Co>hqGd_6 z(laWOg(-T=3Z^Db0gW(YYI=)Iti`h6HW<AuL$+C%IHYR@D7YU+kNN{Wi=vuiE5yN# zF?!rM2E=LovRVsuhr46+n05gWvjMWnR)~UIWb~+?>!>KuD_bE7?vv4@g2XAfIGtZ& zmfi{*U|Zpt6t(0kGN=`A1-NfUuSr9C7RC+T4*#$f7Mp1Fs8%I_!BPW>i|n+yeY)tr z@q(^W(1xcWLH8ECUB4@X$a#AW#4UPD!EuatEBt!URRJKYZ9DY<Eqk5PgfU(;LNHyi zRMI*lP|>pY3~ir69JuL5U$RarhibvCkOjBj=vn7<pzMSxpc(f|*3$V2!}3!zq*e-S zCTYc5L6Y!Rl3v)cIhe?Q&?N}dWn)6s1+|zf76xxH>4oLY(@>TR?dHnX6y9pmQ>)D8 zG;;nj--XvUyy>K8<vP+>U<>*mUf%Fd#T^U4n$cgKCYm-_E6PpnMd`)mU@3Je)Hleo zr*eS<?>y--v2K)<RB7l|Tmc5&g3@Dz{6IB46l>?zzeLe?KjS^Y1KVZM!4w>Yk9N5( zdrd4XAG|xI*Ypqqi9ve)0RvSU-lNiEM5Dk8@lk4hSQMA5(kigIh5UGFU>i8f?T>-} F`#($K!hHY$ diff --git a/pkg/vtiger/modules/RecycleBin/modules/RecycleBin/models/Module.php b/pkg/vtiger/modules/RecycleBin/modules/RecycleBin/models/Module.php index d9dfed4d5..c14b14dc4 100644 --- a/pkg/vtiger/modules/RecycleBin/modules/RecycleBin/models/Module.php +++ b/pkg/vtiger/modules/RecycleBin/modules/RecycleBin/models/Module.php @@ -152,6 +152,7 @@ class RecycleBin_Module_Model extends Vtiger_Module_Model { // Delete related mod comments $this->deleteRelatedComments($recordIds); + $this->deleteRelatedEmails($recordIds); // TODO - Remove records from module tables and other related stores. $query = 'DELETE FROM vtiger_modtracker_basic WHERE crmid in(' . generateQuestionMarks($recordIds) . ')'; @@ -256,4 +257,26 @@ class RecycleBin_Module_Model extends Vtiger_Module_Model { $db->pquery($query, array($recordIds)); } + + /** + * Function to remove emails related to given records + * NOTE : Still need to confirm + * @param type $recordIds + */ + public function deleteRelatedEmails($recordIds) { + $db = PearDatabase::getInstance(); + /** + * we have to delete emails if email is related to any $recordIds and same email is + * not related to another record + */ + $query = "DELETE vtiger_crmentity.* FROM vtiger_crmentity INNER JOIN " + . "(SELECT vtiger_crmentity.crmid AS actid,vtiger_seactivityrel.crmid AS relid " + . "FROM vtiger_crmentity INNER JOIN vtiger_seactivityrel ON " + . "vtiger_seactivityrel.activityid=vtiger_crmentity.crmid " + . "GROUP BY vtiger_seactivityrel.activityid HAVING count(vtiger_seactivityrel.activityid) = 1)" + . " AS relationdata ON relationdata.actid=vtiger_crmentity.crmid " + . "WHERE relationdata.relid IN (" . generateQuestionMarks($recordIds) . ")"; + + $db->pquery($query, array($recordIds)); + } } -- GitLab