fix cancle notification message

This commit is contained in:
Peter Maquiran
2024-04-01 16:55:26 +01:00
parent f754da8cde
commit f34f80d8dc
3 changed files with 21 additions and 5 deletions
@@ -397,7 +397,13 @@ export class NewPublicationPage implements OnInit {
close() { close() {
alert('close');
alert('this.PublicationFromMvService.form.send'+ this.PublicationFromMvService.form.send)
if(this.PublicationFromMvService.form.send == false) {
this.PublicationFromMvService.cancel()
this.PublicationFromMvService.ObjectMergeNotification.close()
}
this.modalController.dismiss(this.PublicationFromMvService.form).then(() => { this.modalController.dismiss(this.PublicationFromMvService.form).then(() => {
this.showLoader = true; this.showLoader = true;
}); });
@@ -87,7 +87,7 @@ export class NewPublicationPage implements OnInit {
private SocketConnectionMCRService: SocketConnectionMCRService, private SocketConnectionMCRService: SocketConnectionMCRService,
private videoconvertService: VideoconvertService, private videoconvertService: VideoconvertService,
public UploadStreamingService: UploadStreamingService, public UploadStreamingService: UploadStreamingService,
private modalController: ModalController, private modalController: ModalController
) { ) {
this.publicationTitle = 'Nova Publicação'; this.publicationTitle = 'Nova Publicação';
this.PublicationFromMvService.clear() this.PublicationFromMvService.clear()
@@ -251,7 +251,7 @@ export class NewPublicationPage implements OnInit {
this.convertBlobToBase64(blobFile.blob).then((value: string) => { this.convertBlobToBase64(blobFile.blob).then((value: string) => {
this.filesSizeSum = this.filesSizeSum + blobFile.size this.filesSizeSum = this.filesSizeSum + blobFile.size
const FileExtension = this.removeTextBeforeSlash(blobFile.mimeType, '/') const FileExtension = this.removeTextBeforeSlash(blobFile.mimeType, '/')
const file = new File([blobFile.blob], blobFile.name); const file = new File([blobFile.blob], blobFile.name);
@@ -272,7 +272,7 @@ export class NewPublicationPage implements OnInit {
}).catch((erro) => { }).catch((erro) => {
console.log(erro) console.log(erro)
}) })
} else { } else {
this.httpErroHandle.validationMessagge('filetype'); this.httpErroHandle.validationMessagge('filetype');
} }
@@ -380,6 +380,10 @@ export class NewPublicationPage implements OnInit {
close() { close() {
if(this.PublicationFromMvService.form.send == false) {
this.PublicationFromMvService.cancel()
this.PublicationFromMvService.ObjectMergeNotification.close()
}
this.goBack(); this.goBack();
} }
@@ -33,6 +33,7 @@ export class PublicationFromMvService {
folderId: string folderId: string
constructor( constructor(
private publications: PublicationsService, private publications: PublicationsService,
private toastService: ToastService, private toastService: ToastService,
@@ -41,6 +42,7 @@ export class PublicationFromMvService {
private CMAPIService: CMAPIService, private CMAPIService: CMAPIService,
public publicationFolderService: PublicationFolderService, public publicationFolderService: PublicationFolderService,
private platform: Platform, private platform: Platform,
private modalController: ModalController,
) {} ) {}
@@ -226,7 +228,6 @@ export class PublicationFromMvService {
} }
closeApp() { closeApp() {
if (window["sharedContent"]) { if (window["sharedContent"]) {
alert('close android') alert('close android')
@@ -236,6 +237,11 @@ export class PublicationFromMvService {
} else { } else {
window["sharedContent"] = null window["sharedContent"] = null
} }
if (this.platform.is('ios')) {
this.modalController.dismiss(this.form).then(() => {
});
}
} }
} }