openstack/skyline-console
Code Issues Proposed changes

Merge "fix: Fix locked value in instance download csv etc."

Browse Source
This commit is contained in:
Zuul 2021-08-27 09:02:30 +00:00 committed by Gerrit Code Review
commit 31fdc5c62f
5 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/locales/en.json
View File

@ -377,7 +377,7 @@
"Current Project Network": "Current Project Network",
"Current Project QoS Policy": "Current Project QoS Policy",
"Current QoS policy name": "Current QoS policy name",
"Current Storage Pool": "Current Storage Pool",
"Current Storage Backend": "Current Storage Backend",
"Current data downloaded.": "Current data downloaded.",
"Custom": "Custom",
"Custom ICMP Rule": "Custom ICMP Rule",
@ -1046,6 +1046,7 @@
"Not Implemented (code: 501) ": "Not Implemented (code: 501) ",
"Not Open": "Not Open",
"Not deleted with the instance": "Not deleted with the instance",
"Not locked": "Not locked",
"Not select": "Not select",
"Not yet bound": "Not yet bound",
"Not yet selected": "Not yet selected",
@ -1526,7 +1527,7 @@
"Target Compute Host": "Target Compute Host",
"Target IP Address": "Target IP Address",
"Target Port": "Target Port",
"Target Storage Pool": "Target Storage Pool",
"Target Storage Backend": "Target Storage Backend",
"Target Subnet": "Target Subnet",
"Template Content": "Template Content",
"Template Name": "Template Name",

5
src/locales/zh.json
View File

@ -377,7 +377,7 @@
"Current Project Network": "当前项目网络",
"Current Project QoS Policy": "当前项目QoS策略",
"Current QoS policy name": "当前QoS策略名称",
"Current Storage Pool": "当前资源池",
"Current Storage Backend": "当前存储后端",
"Current data downloaded.": "当前数据已完成下载。",
"Custom": "自定义",
"Custom ICMP Rule": "定制ICMP规则",
@ -1046,6 +1046,7 @@
"Not Implemented (code: 501) ": "服务器不支持请求（错误码：501）",
"Not Open": "未开放",
"Not deleted with the instance": "不随云主机删除",
"Not locked": "未锁定",
"Not select": "不选择",
"Not yet bound": "尚未绑定",
"Not yet selected": "尚未选择",
@ -1526,7 +1527,7 @@
"Target Compute Host": "目标计算节点",
"Target IP Address": "目标IP地址",
"Target Port": "目标网卡",
"Target Storage Pool": "目标资源池",
"Target Storage Backend": "目标存储后端",
"Target Subnet": "目标子网",
"Template Content": "模板内容",
"Template Name": "模板名称",

4
src/pages/compute/containers/Hypervisors/Hypervisor/index.jsx
View File

@ -40,6 +40,10 @@ export default class Hypervisors extends Base {
return false;
}
get hideCustom() {
return true;
}
getColumns = () => {
const columns = [...hypervisorColumns];
columns[0] = {

1
src/pages/compute/containers/Instance/index.jsx
View File

@ -213,6 +213,7 @@ export default class Instance extends Base {
isHideable: true,
render: lockRender,
width: 80,
stringify: (value) => (value ? t('Locked') : t('Not locked')),
},
{
title: t('Created At'),

4
src/pages/storage/containers/Volume/actions/Migrate.jsx
View File

@ -79,13 +79,13 @@ export default class Migrate extends ModalAction {
},
{
name: 'host',
label: t('Current Storage Pool'),
label: t('Current Storage Backend'),
type: 'label',
iconType: 'instance',
},
{
name: 'pool',
label: t('Target Storage Pool'),
label: t('Target Storage Backend'),
type: 'select-table',
required: true,
datas: this.pools,