Skip to content
GitLab
Menu
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
Melodic
melodic-frontend
Commits
3c93f60e
Commit
3c93f60e
authored
Oct 14, 2019
by
Alicja Reniewicz
Browse files
Merge branch 'rc2.5' into rc2.5-gui-features-
parents
8873089f
06ed38d1
Changes
2
Hide whitespace changes
Inline
Side-by-side
src/app/application/vm-list/vm-list.component.ts
View file @
3c93f60e
...
...
@@ -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
{
...
...
src/app/process/process-details/deployment/schedule-list/schedule-list.component.ts
View file @
3c93f60e
...
...
@@ -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
;
}
}
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment