Skip to content

[ISSUE #3592] Fix incorrect prompt when accessing the restricted namespace #3603

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Aug 14, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -309,6 +309,7 @@ const I18N_CONF = {
cloneSuccEnd: 'configuration items cloned',
cloneFail: 'Clone failed',
getNamespaceFailed: 'get the namespace failed',
getNamespace403: 'Without permission to access ${namespaceName} namespace!',
startCloning: 'Start Clone',
cloningConfiguration: 'Clone config',
source: 'Source :',
Expand All @@ -322,6 +323,7 @@ const I18N_CONF = {
delSelectedAlertContent: 'please select the configuration to delete',
delSuccessMsg: 'delete successful',
cloneEditableTitle: 'Modify Data Id and Group (optional)',
authFail: 'Auth failed',
},
NewConfig: {
newListingMain: 'Create Configuration',
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -307,6 +307,7 @@ const I18N_CONF = {
cloneSuccEnd: '项配置',
cloneFail: '克隆失败',
getNamespaceFailed: '获取命名空间失败',
getNamespace403: '没有 ${namespaceName} 命名空间的访问权限!',
startCloning: '开始克隆',
cloningConfiguration: '克隆配置',
source: '源空间:',
Expand All @@ -320,6 +321,7 @@ const I18N_CONF = {
delSelectedAlertContent: '请选择要删除的配置',
delSuccessMsg: '删除成功',
cloneEditableTitle: '修改 Data Id 和 Group (可选操作)',
authFail: '权限认证失败',
},
NewConfig: {
newListingMain: '新建配置',
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -292,8 +292,11 @@ class ConfigurationManagement extends React.Component {
});
if (res && [401, 403].includes(res.status)) {
Dialog.alert({
title: locale.importFail,
content: locale.importFail403,
title: locale.authFail,
content: locale.getNamespace403.replace(
'${namespaceName}',
this.state.nownamespace_name
),
});
}
});
Expand Down
4 changes: 2 additions & 2 deletions console/src/main/resources/static/js/main.js

Large diffs are not rendered by default.