Merge branch 'v2.1' into master
This commit is contained in:
commit
2d3fc613ec
44 changed files with 923 additions and 392 deletions
|
@ -55,11 +55,11 @@ export default {
|
|||
methods: {
|
||||
getProvider (service) {
|
||||
const words = service.name.split('@')
|
||||
if (words.length !== 2) {
|
||||
return this.provider
|
||||
if (words.length === 2) {
|
||||
return words[1]
|
||||
}
|
||||
|
||||
return words[1]
|
||||
return this.data.provider
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
@ -54,7 +54,7 @@
|
|||
</div>
|
||||
</q-card-section>
|
||||
|
||||
<q-card-section v-if="data.loadBalancer.terminationDelay">
|
||||
<q-card-section v-if="data.loadBalancer && data.loadBalancer.terminationDelay">
|
||||
<div class="row items-start no-wrap">
|
||||
<div class="col">
|
||||
<div class="text-subtitle2">Termination Delay</div>
|
||||
|
|
|
@ -55,11 +55,11 @@ export default {
|
|||
methods: {
|
||||
getProvider (service) {
|
||||
const words = service.name.split('@')
|
||||
if (words.length !== 2) {
|
||||
return this.provider
|
||||
if (words.length === 2) {
|
||||
return words[1]
|
||||
}
|
||||
|
||||
return words[1]
|
||||
return this.data.provider
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue