sanctureplicum
/
gitea
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Issue: Show error prompt when add repository to team and it does not exist #533

release
Unknwon 2014-10-10 05:06:12 -04:00
parent c31606daf9
commit 85c9f7c5f3
3 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
conf/locale/locale_en-US.ini
Unescape Escape View File

@ -408,6 +408,7 @@ teams.admin_permission_desc = This team grants <strong>Admin</strong> access: me
teams.repositories = Team Repositories teams.repositories = Team Repositories
teams.add_team_repository = Add Team Repository teams.add_team_repository = Add Team Repository
teams.remove_repo = Remove teams.remove_repo = Remove
teams.add_nonexistent_repo = The repository you're trying to add does not exist, please create it first.
[admin] [admin]
dashboard = Dashboard dashboard = Dashboard

1
conf/locale/locale_zh-CN.ini
Unescape Escape View File

@ -408,6 +408,7 @@ teams.admin_permission_desc = 该团队拥有一定的 <strong>管理</strong>
teams.repositories = 团队仓库 teams.repositories = 团队仓库
teams.add_team_repository = 添加团队仓库 teams.add_team_repository = 添加团队仓库
teams.remove_repo = 移除仓库 teams.remove_repo = 移除仓库
teams.add_nonexistent_repo = 您尝试添加到团队的仓库不存在，请先创建仓库！
[admin] [admin]
dashboard = 控制面板 dashboard = 控制面板

5
routers/org/teams.go
Unescape Escape View File

@ -124,6 +124,11 @@ func TeamsRepoAction(ctx *middleware.Context) {
var repo *models.Repository var repo *models.Repository
repo, err = models.GetRepositoryByName(ctx.Org.Organization.Id, repoName) repo, err = models.GetRepositoryByName(ctx.Org.Organization.Id, repoName)
if err != nil { if err != nil {
if err == models.ErrRepoNotExist {
ctx.Flash.Error(ctx.Tr("org.teams.add_nonexistent_repo"))
ctx.Redirect(ctx.Org.OrgLink + "/teams/" + ctx.Org.Team.LowerName + "/repositories")
return
}
ctx.Handle(500, "GetRepositoryByName", err) ctx.Handle(500, "GetRepositoryByName", err)
return return
} }