Merge branch 'develop' of gitlab.verizon.com:BPHV_MIPS/mvm_core into develop
This commit is contained in:
commit
8df0b7bdd9
@ -42,6 +42,7 @@ public extension MVMCoreAlertHandler {
|
|||||||
for case let operation as MVMCoreTopAlertOperation in topAlertQueue.operations {
|
for case let operation as MVMCoreTopAlertOperation in topAlertQueue.operations {
|
||||||
if !operation.isCancelled,
|
if !operation.isCancelled,
|
||||||
let pages = operation.topAlertObject.json?.optionalArrayForKey("pages") as? [String],
|
let pages = operation.topAlertObject.json?.optionalArrayForKey("pages") as? [String],
|
||||||
|
pages.count > 0,
|
||||||
(pageType == nil || !pages.contains(pageType!)) {
|
(pageType == nil || !pages.contains(pageType!)) {
|
||||||
if operation.isExecuting {
|
if operation.isExecuting {
|
||||||
operation.reAddAfterCancel = operation.topAlertObject.persistent
|
operation.reAddAfterCancel = operation.topAlertObject.persistent
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user