Skip to content

Commit 5287124

Browse files
authored
Merge pull request #814 from jschoiRR/diplo-2026
[Mold Diplo] 가상머신 생성시 L2네트워크의 NIC linkstate 키값을 소문자로 통일해 false 값 전달되게 수정
2 parents 8694150 + 4251183 commit 5287124

3 files changed

Lines changed: 5 additions & 8 deletions

File tree

ui/src/components/page/GlobalLayout.vue

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -227,8 +227,7 @@ export default {
227227
this.menus = this.mainMenu.find(item => item.path === '/').children
228228
this.collapsed = !this.sidebarOpened
229229
if ('readyForShutdown' in this.$store.getters.apis) {
230-
const job = setInterval(this.checkShutdown, 5000)
231-
this.$store.commit('SET_READY_FOR_SHUTDOWN_POLLING_JOB', job)
230+
this.checkShutdown()
232231
}
233232
},
234233
mounted () {

ui/src/views/auth/Login.vue

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -252,9 +252,6 @@ export default {
252252
}
253253
this.initForm()
254254
if (store.getters.logoutFlag) {
255-
if (store.getters.readyForShutdownPollingJob !== '' || store.getters.readyForShutdownPollingJob !== undefined) {
256-
clearInterval(store.getters.readyForShutdownPollingJob)
257-
}
258255
sourceToken.init()
259256
this.fetchData()
260257
} else {

ui/src/views/compute/wizard/NetworkConfiguration.vue

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@
7575
</template>
7676
<template v-if="column.key === 'linkState'">
7777
<a-form-item v-if="record.type === 'L2'" :name="'linkState' + record.id">
78-
<a-switch v-model:checked="form[`linkState` + record.id]" @change="($event) => updateNetworkData('linkState', record.id, $event)" style="margin-bottom: 30px"/>
78+
<a-switch v-model:checked="form[`linkState` + record.id]" @change="($event) => updateNetworkData('linkstate', record.id, $event)" style="margin-bottom: 30px"/>
7979
</a-form-item>
8080
</template>
8181
</template>
@@ -219,8 +219,9 @@ export default {
219219
form[macAddressKey] = this.preFillContent.macAddressArray[presetMacAddressIndex]
220220
presetMacAddressIndex++
221221
}
222-
console.log('record.linkState :>> ', record.linkState)
223-
form[linkState] = record.linkState === undefined ? true : record.linkState
222+
form[linkState] = record.linkstate === undefined
223+
? (record.linkState === undefined ? true : record.linkState)
224+
: record.linkstate
224225
})
225226
this.form = reactive(form)
226227
this.rules = reactive(rules)

0 commit comments

Comments
 (0)