Skip to content
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.

Sign up for GitHub

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

bugfix: DDC在浏览器进行OAuth授权时自动跳转至首页 #2839 #2844

Merged
merged 1 commit into from
Dec 12, 2024
Merged

bugfix: DDC在浏览器进行OAuth授权时自动跳转至首页 #2839 #2844

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
9 changes: 8 additions & 1 deletion src/frontend/devops-repository/src/App.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,14 @@
}
} else {
let projectId = ''
if (this.projectList.find(v => v.id === urlProjectId)) {
const hasUrlProjectId = this.projectList.find(v => v.id === urlProjectId)
if (!hasUrlProjectId) {
this.$bkMessage({
message: this.$t('projectNoPermissionTip', { 0: urlProjectId }),
theme: 'error'
})
}
if (hasUrlProjectId) {
projectId = urlProjectId
} else if (this.projectList.find(v => v.id === localProjectId)) {
projectId = localProjectId
Expand Down
3 changes: 2 additions & 1 deletion src/frontend/locale/repository/en-US.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -902,5 +902,6 @@
"conanCreditGuideSubTitle1":"1. Execute the following command on the command line to configure remote artifact repository",
"conanCreditGuideSubTitle2":"2、Execute the following command on the command line to configure artifact repository credentials(conan1.x)",
"conanRecipePlaceholder":"The format of RECIPE is <NAME>/VERSION>@<USER>/CHANNEL>",
"conanPullGuideSubTitle":"Please execute the following command on the command line to pull(conan1.x)："
"conanPullGuideSubTitle":"Please execute the following command on the command line to pull(conan1.x)：",
"projectNoPermissionTip": "Request project {0} has no permission and has been switched"
}
3 changes: 2 additions & 1 deletion src/frontend/locale/repository/zh-CN.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -905,5 +905,6 @@
"conanCreditGuideSubTitle1":"1、在命令行执行以下命令配置远程仓库",
"conanCreditGuideSubTitle2":"2、在命令行执行以下命令配置制品仓库凭据(conan1.x)",
"conanRecipePlaceholder":"RECIPE的格式为<NAME>/VERSION>@<USER>/CHANNEL>",
"conanPullGuideSubTitle":"请在命令行执行以下命令进行拉取(conan1.x)："
"conanPullGuideSubTitle":"请在命令行执行以下命令进行拉取(conan1.x)：",
"projectNoPermissionTip": "请求项目{0}无权限，已切换"
}
Loading