From 94c4f7ddd5dc697fc4598ea325df4b54ae52d660 Mon Sep 17 00:00:00 2001 From: sandesh-telus Date: Mon, 3 Jul 2023 19:28:46 +0530 Subject: [PATCH] ZCS-13596: Create Classic UI Zimlet for mail recall functionality - added an option Recall message in the context menu for send folder. --- .../img/mail-recall/ImgMessageRecallClassic.png | Bin 0 -> 1521 bytes .../share/controller/ZmListController.js | 12 ++++++++++++ WebRoot/js/zimbraMail/share/model/ZmSetting.js | 5 ++++- WebRoot/js/zimbraMail/share/model/ZmSettings.js | 2 ++ WebRoot/js/zimbraMail/share/view/ZmActionMenu.js | 4 ++-- 5 files changed, 20 insertions(+), 3 deletions(-) create mode 100644 WebRoot/img/mail-recall/ImgMessageRecallClassic.png diff --git a/WebRoot/img/mail-recall/ImgMessageRecallClassic.png b/WebRoot/img/mail-recall/ImgMessageRecallClassic.png new file mode 100644 index 0000000000000000000000000000000000000000..a321042b46a928c8db6d4de6d8b5f6bacf478b39 GIT binary patch literal 1521 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Ea{HEjtmSN`?>!lvI6-E$sR$z z3=CCj3=9n|3=F@3LJcn%7)lKo7+xhXFj&oCU=S~uvn$XBDAAG{;hE;^%b*2hb1<+n z3NbJPS&Tr)z$nE4G7ZRL@M4sPvx68lplX;H7}_%#SfFa6fHVkr05M1pgl1mAh%j*h z6I`{x0%imor0saV%ts)_S>O>_%)r1c48n{Iv*t)JFfbWphD4M^`1)8S=jZArrsOB3 z>Q&?xfOIj~R9FF-xv3?I3Kh9IdBs*0wn|_XRzNmLSYJs2tfVB{Rw=?aK*2e`C{@8s z&p^*W$&O1wLBXadCCw_x#SN+*$g@?-C@Cqh($_C9FV`zK*2^zS*Eh7ZwA42+(l;{F z1**_3uFNY*tkBIXR)!b?Gsh*hIJqdZpd>RtPXT0ZVp4u-iLH_n$Rap^xHGjP6Jb+c zG1OZ?59)(t^bPe4^s#9x$xOqc4I~562KE=kIvbE-Rsoq6sX37@nYpQX#XzUo85`Mv zZNZR0xD!cZ1d>J*WQ|A?=o+2#bMlLV3lfu4?F^w>kc5y_gIsOpUzC{&3{X(8fs|v2 zLDk#ngTfRkj3E&S76rzj9hZ$hJT=&H6~*5E1WY@#JzX3_ECiA2`;=8q;EpPi|b)-x) z%4Dgg+1u>6cYEueU%axEL$2aZbaKynJ#e|##@U;dVy{BB<_FSjlA z{O=Ej^Zn&!bja&+2}N3;WArnToc(&zr#Eh^Lmvg*b19e^eS4-zQh9Lp!=k*&eZtR- zX7bwE-&ZmyWfMDmdf$IFG$@6lgcdY|w4^ZHELFIMMXp12jR@u^&*;?(YBuh`h` zMM74)Y~)z%R~+3@tMcev;r7;z8|QEwzPVTF{Rr z&N;>P`MoU5a_4G^tzJ;|;?dWNSE`Ou3PMs|?(WBX^Upq0R(o2kOxk?<^rP>;tRBw1_Uq0=m!@3TK-L}qH?!W~pSPyA_tYsV<1P0YFY55{ z^f*eXZ~Ppqa`f#ai-PBDk0v?IVSEv`J!sLguX86ZUF!8meW9XgZN0_W%9{r_O*oTe zvhmOf{|Dt=iD$Q5*sa{%?XR)z{=tPMRZBPS{d*?stz!W1B)v3&enqv%d-#@XEtw;^ gDnyH=?fid+Wo~lUKSfR43@XSxUHx3vIVCg!0Fuxob^rhX literal 0 HcmV?d00001 diff --git a/WebRoot/js/zimbraMail/share/controller/ZmListController.js b/WebRoot/js/zimbraMail/share/controller/ZmListController.js index 0f3b250ff2..11b5e3ad08 100644 --- a/WebRoot/js/zimbraMail/share/controller/ZmListController.js +++ b/WebRoot/js/zimbraMail/share/controller/ZmListController.js @@ -578,6 +578,18 @@ function() { return folder.nId == ZmFolder.ID_OUTBOX; }; +/** + * returns true if the search folder is sent + */ +ZmListController.prototype.isSentFolder = +function() { + var folder = this._getSearchFolder(); + if (!folder) { + return false; + } + return folder.nId == ZmFolder.ID_SENT; +}; + /** * returns true if the search folder is sync failures */ diff --git a/WebRoot/js/zimbraMail/share/model/ZmSetting.js b/WebRoot/js/zimbraMail/share/model/ZmSetting.js index 5479226b1f..858e69f3d9 100644 --- a/WebRoot/js/zimbraMail/share/model/ZmSetting.js +++ b/WebRoot/js/zimbraMail/share/model/ZmSetting.js @@ -270,7 +270,10 @@ ZmSetting.MAIL_UPSELL_ENABLED = "MAIL_UPSELL_ENABLED"; ZmSetting.SOCIAL_EXTERNAL_ENABLED = "SOCIAL_EXTERNAL_ENABLED"; ZmSetting.SOCIAL_EXTERNAL_URL = "SOCIAL_EXTERNAL_URL"; ZmSetting.VOICE_UPSELL_ENABLED = "VOICE_UPSELL_ENABLED"; -ZmSetting.SHARING_ENABLED = "SHARING_ENABLED"; +ZmSetting.SHARING_ENABLED = "SHARING_ENABLED"; + +ZmSetting.MAIL_RECALL_ENABLED = "MAIL_RECALL_ENABLED"; +ZmSetting.MAIL_RECALL_TIME = "MAIL_RECALL_TIME"; //user selected font ZmSetting.FONT_CLASSIC = "classic"; diff --git a/WebRoot/js/zimbraMail/share/model/ZmSettings.js b/WebRoot/js/zimbraMail/share/model/ZmSettings.js index e4b6e6ce7d..0820c1e1c4 100644 --- a/WebRoot/js/zimbraMail/share/model/ZmSettings.js +++ b/WebRoot/js/zimbraMail/share/model/ZmSettings.js @@ -992,6 +992,8 @@ function() { this.registerSetting("RESET_PASSWORD_RECOVERY_CODE_EXPIRY", {name:"zimbraResetPasswordRecoveryCodeExpiry", type:ZmSetting.T_COS, dataType:ZmSetting.D_STRING}); this.registerSetting("PASSWORD_RECOVERY_CODE_VALIDITY", {name:"zimbraRecoveryAccountCodeValidity", type:ZmSetting.T_COS, dataType:ZmSetting.D_STRING}); this.registerSetting("PASSWORD_RECOVERY_SUSPENSION_TIME", {name:"zimbraFeatureResetPasswordSuspensionTime", type:ZmSetting.T_COS, dataType:ZmSetting.D_STRING}); + this.registerSetting("MAIL_RECALL_ENABLED", {name:"zimbraFeatureMailRecallEnabled", type: ZmSetting.T_COS, dataType: ZmSetting.D_BOOLEAN, defaultValue:false}); + this.registerSetting("MAIL_RECALL_TIME", {name:"zimbraFeatureMailRecallTime", type:ZmSetting.T_COS, dataType:ZmSetting.D_INT, defaultValue:30}); // user metadata (included with COS since the user can't change them) this.registerSetting("LICENSE_STATUS", {type:ZmSetting.T_COS, defaultValue:ZmSetting.LICENSE_GOOD}); diff --git a/WebRoot/js/zimbraMail/share/view/ZmActionMenu.js b/WebRoot/js/zimbraMail/share/view/ZmActionMenu.js index 35b9e4efc3..1d53f73c5b 100644 --- a/WebRoot/js/zimbraMail/share/view/ZmActionMenu.js +++ b/WebRoot/js/zimbraMail/share/view/ZmActionMenu.js @@ -100,8 +100,8 @@ function(id, params, elementId) { }; ZmActionMenu.prototype.addOp = -function(id) { - ZmOperation.addOperation(this, id, this._menuItems); +function(id, index) { + ZmOperation.addOperation(this, id, this._menuItems, index); }; ZmActionMenu.prototype.removeOp =