Browse Source

make sure to catch the right error so it is displayed as an error on the ui not a 500 (#4945)

tags/v1.21.12.1
Lanre Adelowo Lauris BH 7 years ago
parent
commit
acb6f8a518
2 changed files with 2 additions and 2 deletions
  1. +1
    -1
      models/ssh_key.go
  2. +1
    -1
      routers/repo/setting.go

+ 1
- 1
models/ssh_key.go View File

@@ -732,7 +732,7 @@ func AddDeployKey(repoID int64, name, content string, readOnly bool) (*DeployKey

key, err := addDeployKey(sess, pkey.ID, repoID, name, pkey.Fingerprint, accessMode)
if err != nil {
return nil, fmt.Errorf("addDeployKey: %v", err)
return nil, err
}

return key, sess.Commit()


+ 1
- 1
routers/repo/setting.go View File

@@ -586,7 +586,7 @@ func DeployKeysPost(ctx *context.Context, form auth.AddKeyForm) {
if err != nil {
ctx.Data["HasError"] = true
switch {
case models.IsErrKeyAlreadyExist(err):
case models.IsErrDeployKeyAlreadyExist(err):
ctx.Data["Err_Content"] = true
ctx.RenderWithErr(ctx.Tr("repo.settings.key_been_used"), tplDeployKeys, &form)
case models.IsErrKeyNameAlreadyUsed(err):


Loading…
Cancel
Save