fixup! TF-4392 [Team Mailbox] Hide Recover deleted messages and Archive message in team mailbox
This commit is contained in:
@@ -87,20 +87,20 @@ mixin MailboxWidgetMixin {
|
|||||||
return [
|
return [
|
||||||
if (PlatformInfo.isWeb && mailbox.isSubscribedMailbox)
|
if (PlatformInfo.isWeb && mailbox.isSubscribedMailbox)
|
||||||
MailboxActions.openInNewTab,
|
MailboxActions.openInNewTab,
|
||||||
if (mailbox.myRights?.mayCreateChild != false)
|
if (mailbox.myRights?.mayCreateChild == true)
|
||||||
MailboxActions.newSubfolder,
|
MailboxActions.newSubfolder,
|
||||||
if (mailbox.countUnReadEmailsAsString.isNotEmpty)
|
if (mailbox.countUnReadEmailsAsString.isNotEmpty)
|
||||||
MailboxActions.markAsRead,
|
MailboxActions.markAsRead,
|
||||||
if (mailbox.myRights?.mayRename != false)
|
if (mailbox.myRights?.mayRename == true)
|
||||||
MailboxActions.rename,
|
MailboxActions.rename,
|
||||||
if (mailbox.isTeamMailboxes)
|
if (mailbox.isTeamMailboxes)
|
||||||
if (mailbox.isSubscribedMailbox)
|
if (mailbox.isSubscribedMailbox)
|
||||||
MailboxActions.disableMailbox
|
MailboxActions.disableMailbox
|
||||||
else
|
else
|
||||||
MailboxActions.enableMailbox,
|
MailboxActions.enableMailbox,
|
||||||
if (mailbox.isTrash && mailbox.myRights?.mayRemoveItems != false)
|
if (mailbox.isTrash && mailbox.myRights?.mayRemoveItems == true)
|
||||||
MailboxActions.emptyTrash,
|
MailboxActions.emptyTrash,
|
||||||
if (mailbox.myRights?.mayDelete != false)
|
if (mailbox.myRights?.mayDelete == true)
|
||||||
MailboxActions.delete,
|
MailboxActions.delete,
|
||||||
];
|
];
|
||||||
}
|
}
|
||||||
|
|||||||
+2
-2
@@ -2406,7 +2406,7 @@ class MailboxDashBoardController extends ReloadableController
|
|||||||
PresentationMailbox? mailbox
|
PresentationMailbox? mailbox
|
||||||
) {
|
) {
|
||||||
return mailbox != null &&
|
return mailbox != null &&
|
||||||
(mailbox.isTrash || (mailbox.isTrashTeamMailbox && mailbox.myRights?.mayRemoveItems != false)) &&
|
(mailbox.isTrash || (mailbox.isTrashTeamMailbox && mailbox.myRights?.mayRemoveItems == true)) &&
|
||||||
mailbox.countTotalEmails > 0 &&
|
mailbox.countTotalEmails > 0 &&
|
||||||
!searchController.isSearchActive() &&
|
!searchController.isSearchActive() &&
|
||||||
responsiveUtils.isWebDesktop(context);
|
responsiveUtils.isWebDesktop(context);
|
||||||
@@ -2417,7 +2417,7 @@ class MailboxDashBoardController extends ReloadableController
|
|||||||
PresentationMailbox? mailbox
|
PresentationMailbox? mailbox
|
||||||
) {
|
) {
|
||||||
return mailbox != null &&
|
return mailbox != null &&
|
||||||
(mailbox.isTrash || (mailbox.isTrashTeamMailbox && mailbox.myRights?.mayRemoveItems != false)) &&
|
(mailbox.isTrash || (mailbox.isTrashTeamMailbox && mailbox.myRights?.mayRemoveItems == true)) &&
|
||||||
mailbox.countTotalEmails > 0 &&
|
mailbox.countTotalEmails > 0 &&
|
||||||
!searchController.isSearchActive() &&
|
!searchController.isSearchActive() &&
|
||||||
!responsiveUtils.isWebDesktop(context);
|
!responsiveUtils.isWebDesktop(context);
|
||||||
|
|||||||
+3
-2
@@ -48,8 +48,9 @@ extension HandlePressEmailSelectionActionExtension on ThreadController {
|
|||||||
EmailSelectionActionType.markAsNotSpam
|
EmailSelectionActionType.markAsNotSpam
|
||||||
else
|
else
|
||||||
EmailSelectionActionType.markAsSpam,
|
EmailSelectionActionType.markAsSpam,
|
||||||
if (selectedMailbox?.isArchive != true &&
|
if (emails.isArchiveMessageEnabled(
|
||||||
selectedMailbox?.isChildOfTeamMailboxes != true)
|
mailboxDashBoardController.mapMailboxById,
|
||||||
|
))
|
||||||
EmailSelectionActionType.archiveMessage,
|
EmailSelectionActionType.archiveMessage,
|
||||||
if (selectedMailbox?.isDeletePermanentlyEnabled == true)
|
if (selectedMailbox?.isDeletePermanentlyEnabled == true)
|
||||||
EmailSelectionActionType.deletePermanently,
|
EmailSelectionActionType.deletePermanently,
|
||||||
|
|||||||
+6
-4
@@ -35,10 +35,12 @@ extension GetThreadDetailActionStatus on ThreadDetailController {
|
|||||||
|
|
||||||
bool get threadDetailIsTeamMailbox {
|
bool get threadDetailIsTeamMailbox {
|
||||||
return emailsInThreadDetailInfo.any((email) {
|
return emailsInThreadDetailInfo.any((email) {
|
||||||
final mailboxId = email.mailboxIdContain;
|
return email.mailboxIds?.keys.any(
|
||||||
if (mailboxId == null) return false;
|
(mailboxId) =>
|
||||||
return mailboxDashBoardController.mapMailboxById[mailboxId]
|
mailboxDashBoardController
|
||||||
?.isChildOfTeamMailboxes ==
|
.mapMailboxById[mailboxId]?.isChildOfTeamMailboxes ==
|
||||||
|
true,
|
||||||
|
) ==
|
||||||
true;
|
true;
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user