diff --git a/src/locales/en.json b/src/locales/en.json index 6810a63a..b5aa52e3 100644 --- a/src/locales/en.json +++ b/src/locales/en.json @@ -822,6 +822,7 @@ "Domain ID/Name": "Domain ID/Name", "Domain Manager": "Domain Manager", "Domain Name": "Domain Name", + "Domain name ending in.": "Domain name ending in.", "Domains": "Domains", "Dominica": "Dominica", "Down": "Down", diff --git a/src/locales/ko-kr.json b/src/locales/ko-kr.json index ca4a239e..5b257da7 100644 --- a/src/locales/ko-kr.json +++ b/src/locales/ko-kr.json @@ -821,7 +821,8 @@ "Domain ID": "", "Domain ID/Name": "", "Domain Manager": "Domain 관리자", - "Domain Name": "", + "Domain Name": "도메인 이름", + "Domain name ending in.": "도메인 이름 끝", "Domains": "", "Dominica": "", "Down": "", diff --git a/src/locales/zh-hans.json b/src/locales/zh-hans.json index 5ccc5793..ae2ad882 100644 --- a/src/locales/zh-hans.json +++ b/src/locales/zh-hans.json @@ -822,6 +822,7 @@ "Domain ID/Name": "域ID/名称", "Domain Manager": "域管理员", "Domain Name": "域名", + "Domain name ending in.": "域名结尾", "Domains": "域", "Dominica": "多米尼克国", "Down": "停止", diff --git a/src/pages/network/containers/DNS/Reverse/actions/Set.jsx b/src/pages/network/containers/DNS/Reverse/actions/Set.jsx index 7d83431d..f1ce9d91 100644 --- a/src/pages/network/containers/DNS/Reverse/actions/Set.jsx +++ b/src/pages/network/containers/DNS/Reverse/actions/Set.jsx @@ -45,13 +45,13 @@ export class Set extends ModalAction { type: 'input', required: true, placeholder: t('smtp.example.com'), - tip: ('Domain name ending in.') + tip: t('Domain name ending in.'), }, { name: 'description', label: t('Description'), type: 'textarea', - tip: t('Details about the PTR record.') + tip: t('Details about the PTR record.'), }, { name: 'ttl', @@ -61,12 +61,12 @@ export class Set extends ModalAction { tip: t('Time To Live in seconds.'), placeholder: t('3600'), }, - ] + ]; } onSubmit = (values) => { const { id } = this.item; - return this.store.set({ id: id }, values); + return this.store.set({ id }, values); }; } diff --git a/src/pages/network/containers/DNS/Reverse/actions/Unset.jsx b/src/pages/network/containers/DNS/Reverse/actions/Unset.jsx index e44dfe05..73929235 100644 --- a/src/pages/network/containers/DNS/Reverse/actions/Unset.jsx +++ b/src/pages/network/containers/DNS/Reverse/actions/Unset.jsx @@ -33,7 +33,7 @@ export default class Unset extends ConfirmAction { allowedCheckFunc = (item) => { if (item.ptrdname !== null && item.status === 'ACTIVE') return true; return false; - } + }; policy = 'instance:delete'; @@ -46,6 +46,6 @@ export default class Unset extends ConfirmAction { }; onSubmit = (item) => { - return globalReverseStore.unset({ id: item.id }, { 'ptrdname': null }); + return globalReverseStore.unset({ id: item.id }, { ptrdname: null }); }; -} \ No newline at end of file +} diff --git a/src/pages/network/containers/DNS/Reverse/actions/index.jsx b/src/pages/network/containers/DNS/Reverse/actions/index.jsx index 0f889e55..005c6724 100644 --- a/src/pages/network/containers/DNS/Reverse/actions/index.jsx +++ b/src/pages/network/containers/DNS/Reverse/actions/index.jsx @@ -22,7 +22,7 @@ const actionConfigs = { { action: Unset, }, - ] + ], }, }; diff --git a/src/pages/network/containers/DNS/Reverse/index.jsx b/src/pages/network/containers/DNS/Reverse/index.jsx index f9d429ac..b3336e31 100644 --- a/src/pages/network/containers/DNS/Reverse/index.jsx +++ b/src/pages/network/containers/DNS/Reverse/index.jsx @@ -12,8 +12,8 @@ import { observer, inject } from 'mobx-react'; import Base from 'containers/List'; -import actionConfigs from './actions'; import globalReverseStore, { ReverseStore } from 'src/stores/designate/reverse'; +import actionConfigs from './actions'; export class Reverse extends Base { init() { @@ -55,8 +55,7 @@ export class Reverse extends Base { dataIndex: 'status', isHideable: true, }, - ] - + ]; } -export default inject('rootStore')(observer(Reverse)); \ No newline at end of file +export default inject('rootStore')(observer(Reverse)); diff --git a/src/pages/network/containers/LoadBalancers/Listener/index.jsx b/src/pages/network/containers/LoadBalancers/Listener/index.jsx index 4ff4a35c..688b5517 100644 --- a/src/pages/network/containers/LoadBalancers/Listener/index.jsx +++ b/src/pages/network/containers/LoadBalancers/Listener/index.jsx @@ -16,6 +16,7 @@ import { observer, inject } from 'mobx-react'; import Base from 'containers/List'; import { provisioningStatusCodes } from 'resources/octavia/lb'; import { ListenerStore } from 'stores/octavia/listener'; +import { emptyActionConfig } from 'utils/constants'; import { actionConfigs, adminActions } from './Actions'; export class Listeners extends Base { @@ -53,6 +54,10 @@ export class Listeners extends Base { } get actionConfigs() { + const { provisioning_status } = this.props.detail; + if (provisioning_status !== 'ACTIVE') { + return emptyActionConfig; + } if (this.isAdminPage) { return adminActions; }