Commit 9cd6dbb3 authored by Alicja Reniewicz's avatar Alicja Reniewicz
Browse files

Merge pull request #45 in MEL/melodic-frontend from rc2.5 to master

* commit '06ed38d1':
  checking if values are not null in nodes (for open stack)
parents 7d156b14 06ed38d1
......@@ -110,7 +110,7 @@ export class VmListComponent implements OnInit {
const locationId = vm.originId.split('/')[0];
const location = this.locationList
.find(value => value.id === locationId);
return location ? location.geoLocation.city : 'UNKNOWN';
return (location && location.geoLocation) ? location.geoLocation.city : 'UNKNOWN';
}
userHasPermissionToSshConnection(vm: NodeCloudiator): boolean {
......
......@@ -54,8 +54,10 @@ export class ScheduleListComponent implements OnInit {
getTasksList(schedule: ScheduleCloudiator): string[] {
const result = [];
schedule.processes
.forEach(value => result.push(value.task));
if (schedule.processes !== null) {
schedule.processes
.forEach(value => result.push(value.task));
}
return result;
}
}
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment