TF-2184 Change the order of multi actions
(cherry picked from commit 1efc364a02ba423250e2af1f6d8718421b3803dc)
This commit is contained in:
+10
-10
@@ -221,16 +221,6 @@ class RulesFilterCreatorController extends BaseMailboxController {
|
|||||||
RuleFilterActionArguments newRuleFilterAction = RuleFilterActionArguments.newAction(action);
|
RuleFilterActionArguments newRuleFilterAction = RuleFilterActionArguments.newAction(action);
|
||||||
listEmailRuleFilterActionSelected.add(newRuleFilterAction);
|
listEmailRuleFilterActionSelected.add(newRuleFilterAction);
|
||||||
}
|
}
|
||||||
if (currentAction.markAsSeen == true) {
|
|
||||||
EmailRuleFilterAction? action = EmailRuleFilterAction.maskAsSeen;
|
|
||||||
RuleFilterActionArguments newRuleFilterAction = RuleFilterActionArguments.newAction(action);
|
|
||||||
listEmailRuleFilterActionSelected.add(newRuleFilterAction);
|
|
||||||
}
|
|
||||||
if (currentAction.markAsImportant == true) {
|
|
||||||
EmailRuleFilterAction? action = EmailRuleFilterAction.startIt;
|
|
||||||
RuleFilterActionArguments newRuleFilterAction = RuleFilterActionArguments.newAction(action);
|
|
||||||
listEmailRuleFilterActionSelected.add(newRuleFilterAction);
|
|
||||||
}
|
|
||||||
if (currentAction.appendIn.mailboxIds.isNotEmpty == true) {
|
if (currentAction.appendIn.mailboxIds.isNotEmpty == true) {
|
||||||
for (var mailboxId in currentAction.appendIn.mailboxIds) {
|
for (var mailboxId in currentAction.appendIn.mailboxIds) {
|
||||||
if (mailboxId == findMailboxNodeByRole(PresentationMailbox.roleSpam)?.item.id) {
|
if (mailboxId == findMailboxNodeByRole(PresentationMailbox.roleSpam)?.item.id) {
|
||||||
@@ -244,6 +234,16 @@ class RulesFilterCreatorController extends BaseMailboxController {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
if (currentAction.markAsImportant == true) {
|
||||||
|
EmailRuleFilterAction? action = EmailRuleFilterAction.startIt;
|
||||||
|
RuleFilterActionArguments newRuleFilterAction = RuleFilterActionArguments.newAction(action);
|
||||||
|
listEmailRuleFilterActionSelected.add(newRuleFilterAction);
|
||||||
|
}
|
||||||
|
if (currentAction.markAsSeen == true) {
|
||||||
|
EmailRuleFilterAction? action = EmailRuleFilterAction.maskAsSeen;
|
||||||
|
RuleFilterActionArguments newRuleFilterAction = RuleFilterActionArguments.newAction(action);
|
||||||
|
listEmailRuleFilterActionSelected.add(newRuleFilterAction);
|
||||||
|
}
|
||||||
|
|
||||||
if (listEmailRuleFilterActionSelected.length >= maxCountAction) {
|
if (listEmailRuleFilterActionSelected.length >= maxCountAction) {
|
||||||
isShowAddAction.value = false;
|
isShowAddAction.value = false;
|
||||||
|
|||||||
Reference in New Issue
Block a user