Skip to content

Commit 67a8241

Browse files
authored
Merge pull request #655 from jeongda-young/pcihost
pci 해제 시 문구 수정
2 parents f5fc2b9 + c5213b7 commit 67a8241

4 files changed

Lines changed: 8 additions & 25 deletions

File tree

ui/public/locales/en.json

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4646,7 +4646,7 @@
46464646
"message.restart.vm.host.update.settings": "Applies only when the virtual machine is rebooted",
46474647
"message.success.update.vm": "Host device applied",
46484648
"label.select.vm": "Please select a virtual machine",
4649-
"label.listhostdevices": "Host devices",
4649+
"label.listhostdevices": "Devices",
46504650
"message.warning.host.devices": "Applies only when the virtual machine is completely stopped and started. (You must set the active.additional.vm.configur ratio to true in global settings)",
46514651
"label.recent.events": "Recent Events",
46524652
"dr.create": "DR.CREATE",
@@ -4779,7 +4779,7 @@
47794779
"message.error.remove.alloc": "Unassigning device failed",
47804780
"message.delete.device.alloc": "Unassigning devices in virtual machines",
47814781
"message.success.allocate.device": "Device allocation completed",
4782-
"message.confirm.delete.device": "Are you sure you want to delete the device",
4782+
"message.confirm.delete.device": "Please unassign the virtual machine after it has been stopped",
47834783
"state.up" :"Running",
47844784
"state.down" :"Stopped",
47854785
"state.maintenance" :"Maintenance Mode",
@@ -4797,5 +4797,6 @@
47974797
"state.backingup" : "Backing Up",
47984798
"state.deytroying" : "Deleting",
47994799
"state.scheduled" : "Scheduled",
4800-
"state.started" : "Started"
4800+
"state.started" : "Started",
4801+
"message.delete.device.allocation": "Unassigning devices in virtual machines"
48014802
}

ui/public/locales/ko_KR.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4646,7 +4646,7 @@
46464646
"message.restart.vm.host.update.settings": "\uac00\uc0c1\uba38\uc2e0\uc744 \uc7ac\ubd80\ud305 \ud574\uc57c \uc801\uc6a9\ub429\ub2c8\ub2e4.",
46474647
"message.success.update.vm": "\ud638\uc2a4\ud2b8 \ub514\ubc14\uc774\uc2a4\uac00 \uc801\uc6a9\ub418\uc5c8\uc2b5\ub2c8\ub2e4.",
46484648
"label.select.vm": "\uac00\uc0c1\uba38\uc2e0\ub97c \uc120\ud0dd\ud574\uc8fc\uc138\uc694.",
4649-
"label.listhostdevices": "\ud638\uc2a4\ud2b8 \ub514\ubc14\uc774\uc2a4",
4649+
"label.listhostdevices": "\ub514\ubc14\uc774\uc2a4",
46504650
"message.warning.host.devices": "\uac00\uc0c1\uba38\uc2e0\uc744 \uc644\uc804\ud788 \uc815\uc9c0 \ud6c4 \uc2dc\uc791\ud558\uc154\uc57c \uc801\uc6a9\uc774 \ub429\ub2c8\ub2e4. (\uae00\ub85c\ubc8c \uc124\uc815\uc5d0\uc11c enable.additional.vm.configuratio\ub97c true\ub85c \uc124\uc815\ud574\uc57c\ud569\ub2c8\ub2e4.)",
46514651
"label.recent.events": "\ucd5c\uadfc \uc774\ubca4\ud2b8",
46524652
"dr.create": "DR.\uc0dd\uc131",
@@ -4779,7 +4779,7 @@
47794779
"message.error.remove.allocation": "\ub514\ubc14\uc774\uc2a4 \ud560\ub2f9 \ud574\uc81c\uc5d0 \uc2e4\ud328\ud558\uc600\uc2b5\ub2c8\ub2e4.",
47804780
"message.delete.device.allocation": "\uc5d0 \uc788\ub294 \ub514\ubc14\uc774\uc2a4 \ud560\ub2f9 \ud574\uc81c",
47814781
"message.success.allocate.device": "\ub514\ubc14\uc774\uc2a4 \ud560\ub2f9 \uc644\ub8cc",
4782-
"message.confirm.delete.device": "\ub514\ubc14\uc774\uc2a4\ub97c \uc0ad\uc81c\ud558\uc2dc\uaca0\uc2b5\ub2c8\uae4c?",
4782+
"message.confirm.delete.device": "\uac00\uc0c1\uba38\uc2e0\uc744 \uc815\uc9c0 \ud55c \ud6c4\uc5d0 \ud560\ub2f9\uc744 \ud574\uc81c\ud574\uc8fc\uc138\uc694.",
47834783
"state.up" :"\uc2e4\ud589 \uc911",
47844784
"state.down" :"\uc911\uc9c0 \ub428",
47854785
"state.maintenance" :"\uc720\uc9c0\ubcf4\uc218 \ubaa8\ub4dc",

ui/src/views/infra/ListHostDevicesTab.vue

Lines changed: 2 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -95,26 +95,13 @@
9595
@close-action="closeAction"
9696
@allocation-completed="onAllocationCompleted"
9797
@device-allocated="handleDeviceAllocated" />
98-
<!-- <HostUsbDevicesTransfer
99-
v-else-if="activeKey === '2'"
100-
ref="hostUsbDevicesTransfer"
101-
:resource="selectedResource"
102-
@close-action="closeAction"
103-
@allocation-completed="onAllocationCompleted"
104-
@device-allocated="handleDeviceAllocated" />
105-
<HostLunDevicesTransfer
106-
v-else
107-
ref="hostLunDevicesTransfer"
108-
:resource="selectedResource"
109-
@close-action="closeAction"
110-
@allocation-completed="onAllocationCompleted" -->
111-
<!-- @device-allocated="handleDeviceAllocated" /> -->
11298
</a-modal>
11399

114-
<!-- PCI 디바이스 모달로 통일 -->
115100
<a-modal
116101
v-model:visible="showPciDeleteModal"
117102
:title="`${vmNames[selectedPciDevice?.hostDevicesName] || ''} ${$t('message.delete.device.allocation')}`"
103+
:cancelText="$t('label.cancel')"
104+
:okText="$t('label.ok')"
118105
@ok="handlePciDeviceDelete"
119106
@cancel="closePciDeleteModal"
120107
>
@@ -130,8 +117,6 @@ import { api } from '@/api'
130117
import eventBus from '@/config/eventBus'
131118
import { IdcardOutlined, PlusOutlined, DeleteOutlined } from '@ant-design/icons-vue'
132119
import HostDevicesTransfer from '@/views/storage/HostDevicesTransfer'
133-
// import HostUsbDevicesTransfer from '@/views/storage/HostUsbDevicesTransfer'
134-
// import HostLunDevicesTransfer from '@/views/storage/HostLunDevicesTransfer'
135120
136121
export default {
137122
name: 'ListHostDevicesTab',
@@ -140,8 +125,6 @@ export default {
140125
PlusOutlined,
141126
DeleteOutlined,
142127
HostDevicesTransfer
143-
// HostUsbDevicesTransfer,
144-
// HostLunDevicesTransfer
145128
},
146129
props: {
147130
resource: {

ui/src/views/storage/HostDevicesTransfer.vue

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -318,4 +318,3 @@ export default {
318318
}
319319
}
320320
</style>
321-

0 commit comments

Comments
 (0)