MaDgIK
/
connect-admin
13
0
Fork 0
Code Issues Pull Requests Projects Releases 9 Wiki Activity

[Admin | Trunk]: Fix upload/delete photo of curator bug 

git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-admin-portal/trunk@59484 d315682c-612b-4755-9ff5-7f18f6832af3
This commit is contained in:
k.triantafyllou 2020-09-28 12:00:20 +00:00
parent d1fba2997f
commit 316bdbbaf6
1 changed files with 24 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
src/app/pages/curator/curator.component.ts
View File

@ -220,6 +220,22 @@ export class CuratorComponent implements OnInit {
} }
} }
saveCurator() {
this.curatorService.updateCurator(this.properties, this.curator).subscribe((curator) => {
if (curator) {
this.handleSuccessfulSave('Your data has been saved successfully!');
this.newCurator = false;
this.file = null;
this.deletePhoto = false;
this.resetChange();
}
},
error => {
this.handleUpdateError('An error has occurred. Try again later!', error);
this.resetChange();
});
}
updateCurator() { updateCurator() {
if (!Session.isLoggedIn()) { if (!Session.isLoggedIn()) {
@ -236,36 +252,19 @@ export class CuratorComponent implements OnInit {
this.utilitiesService.deletePhoto(this.properties.utilsService + '/delete/' + this.curator.photo).subscribe(); this.utilitiesService.deletePhoto(this.properties.utilsService + '/delete/' + this.curator.photo).subscribe();
} }
this.curator.photo = res.filename; this.curator.photo = res.filename;
this.curatorService.updateCurator(this.properties, this.curator).subscribe((curator) => { this.saveCurator();
if (curator) {
this.handleSuccessfulSave('Your data has been saved successfully!');
this.newCurator = false;
this.resetChange();
}
},
error => {
this.handleUpdateError('An error has occurred. Try again later!', error);
this.resetChange();
});
}, error => { }, error => {
this.handleUpdateError('An error has occurred during photo uploading.', error); this.handleUpdateError('An error has occurred during photo uploading.', error);
} }
); );
} else { } else {
if (this.deletePhoto) { if (this.deletePhoto) {
if(this.curator.photo && this.curator.photo != '') {
this.utilitiesService.deletePhoto(this.properties.utilsService + '/delete/' + this.curator.photo).subscribe(); this.utilitiesService.deletePhoto(this.properties.utilsService + '/delete/' + this.curator.photo).subscribe();
this.curator.photo = ''; this.curator.photo = '';
} }
this.curatorService.updateCurator(this.properties, this.curator).subscribe((curator) => {
if (curator) {
this.handleSuccessfulSave('Your data has been saved successfully!');
this.resetChange();
} }
}, this.saveCurator();
error => {
this.handleUpdateError('An error has occurred. Try again later!', error);
this.resetChange();
});
} }
} }
} }
@ -273,16 +272,13 @@ export class CuratorComponent implements OnInit {
onNameChange() { onNameChange() {
this.hasChanged = true; this.hasChanged = true;
if (!this.curator.name || this.curator.name === '') { this.enabled = !(!this.curator.name || this.curator.name === '');
this.enabled = false;
} else {
this.enabled = true;
}
} }
removePhoto() { removePhoto() {
this.deletePhoto = true; this.deletePhoto = true;
this.hasChanged = true; this.hasChanged = true;
this.file = null;
this.photo = 'assets/common-assets/curator-default.png'; this.photo = 'assets/common-assets/curator-default.png';
} }