mirror of https://github.com/rancher/dashboard.git
Merge pull request #3017 from richard-cox/workload-form-fixes
Workloads: Fix two minor form issues
This commit is contained in:
commit
6075efa4cd
|
|
@ -102,10 +102,9 @@ export default {
|
|||
args: this.args,
|
||||
workingDir: this.workingDir,
|
||||
tty: this.tty,
|
||||
|
||||
};
|
||||
|
||||
this.$emit('input', cleanUp(out) );
|
||||
this.$emit('input', cleanUp(out));
|
||||
},
|
||||
},
|
||||
};
|
||||
|
|
|
|||
|
|
@ -249,7 +249,10 @@ export default {
|
|||
},
|
||||
|
||||
allContainers() {
|
||||
return [...this.podTemplateSpec.containers, ...(this.podTemplateSpec.initContainers || []).map((each) => {
|
||||
const containers = this.podTemplateSpec?.containers || [];
|
||||
const initContainers = this.podTemplateSpec?.initContainers || [];
|
||||
|
||||
return [...containers, ...initContainers.map((each) => {
|
||||
each._init = true;
|
||||
|
||||
return each;
|
||||
|
|
@ -744,7 +747,7 @@ export default {
|
|||
</button>
|
||||
</div>
|
||||
</div>
|
||||
<Tabbed :key="allContainers.indexOf(container)" :side-tabs="true">
|
||||
<Tabbed :key="container.name" :side-tabs="true">
|
||||
<Tab :label="t('workload.container.titles.general')" name="general">
|
||||
<div>
|
||||
<div :style="{'align-items':'center'}" class="row mb-20">
|
||||
|
|
|
|||
|
|
@ -327,7 +327,6 @@ export default {
|
|||
|
||||
<button v-shortkey.once="['/']" class="hide" @shortkey="focusSearch()" />
|
||||
<AsyncButton mode="refresh" size="sm" @click="refresh" />
|
||||
<!-- </div> -->
|
||||
</div>
|
||||
|
||||
<Banner v-for="err in loadingErrors" :key="err" color="error" :label="err" />
|
||||
|
|
|
|||
Loading…
Reference in New Issue