mirror of
https://code.equilibrium.co.ao/ITO/doneit-web.git
synced 2026-04-18 12:37:53 +00:00
fix cancle notification message
This commit is contained in:
@@ -397,7 +397,13 @@ export class NewPublicationPage implements OnInit {
|
||||
|
||||
|
||||
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.showLoader = true;
|
||||
});
|
||||
|
||||
@@ -87,7 +87,7 @@ export class NewPublicationPage implements OnInit {
|
||||
private SocketConnectionMCRService: SocketConnectionMCRService,
|
||||
private videoconvertService: VideoconvertService,
|
||||
public UploadStreamingService: UploadStreamingService,
|
||||
private modalController: ModalController,
|
||||
private modalController: ModalController
|
||||
) {
|
||||
this.publicationTitle = 'Nova Publicação';
|
||||
this.PublicationFromMvService.clear()
|
||||
@@ -380,6 +380,10 @@ export class NewPublicationPage implements OnInit {
|
||||
|
||||
|
||||
close() {
|
||||
if(this.PublicationFromMvService.form.send == false) {
|
||||
this.PublicationFromMvService.cancel()
|
||||
this.PublicationFromMvService.ObjectMergeNotification.close()
|
||||
}
|
||||
this.goBack();
|
||||
}
|
||||
|
||||
|
||||
@@ -33,6 +33,7 @@ export class PublicationFromMvService {
|
||||
folderId: string
|
||||
|
||||
|
||||
|
||||
constructor(
|
||||
private publications: PublicationsService,
|
||||
private toastService: ToastService,
|
||||
@@ -41,6 +42,7 @@ export class PublicationFromMvService {
|
||||
private CMAPIService: CMAPIService,
|
||||
public publicationFolderService: PublicationFolderService,
|
||||
private platform: Platform,
|
||||
private modalController: ModalController,
|
||||
) {}
|
||||
|
||||
|
||||
@@ -226,7 +228,6 @@ export class PublicationFromMvService {
|
||||
|
||||
}
|
||||
|
||||
|
||||
closeApp() {
|
||||
if (window["sharedContent"]) {
|
||||
alert('close android')
|
||||
@@ -236,6 +237,11 @@ export class PublicationFromMvService {
|
||||
} else {
|
||||
window["sharedContent"] = null
|
||||
}
|
||||
|
||||
if (this.platform.is('ios')) {
|
||||
this.modalController.dismiss(this.form).then(() => {
|
||||
});
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user