diff options
| -rw-r--r-- | modules/convert/convert.go | 2 | ||||
| -rw-r--r-- | routers/web/repo/view.go | 2 | ||||
| -rw-r--r-- | tests/integration/api_repo_lfs_locks_test.go | 7 |
3 files changed, 6 insertions, 5 deletions
diff --git a/modules/convert/convert.go b/modules/convert/convert.go index af759cb938..187c67fa76 100644 --- a/modules/convert/convert.go +++ b/modules/convert/convert.go @@ -412,7 +412,7 @@ func ToLFSLock(l *git_model.LFSLock) *api.LFSLock { Path: l.Path, LockedAt: l.Created.Round(time.Second), Owner: &api.LFSLockOwner{ - Name: u.DisplayName(), + Name: u.Name, }, } } diff --git a/routers/web/repo/view.go b/routers/web/repo/view.go index 768a30ec21..34305b7621 100644 --- a/routers/web/repo/view.go +++ b/routers/web/repo/view.go @@ -455,7 +455,7 @@ func renderFile(ctx *context.Context, entry *git.TreeEntry, treeLink, rawLink st ctx.ServerError("GetTreePathLock", err) return } - ctx.Data["LFSLockOwner"] = u.DisplayName() + ctx.Data["LFSLockOwner"] = u.Name ctx.Data["LFSLockOwnerHomeLink"] = u.HomeLink() ctx.Data["LFSLockHint"] = ctx.Tr("repo.editor.this_file_locked") } diff --git a/tests/integration/api_repo_lfs_locks_test.go b/tests/integration/api_repo_lfs_locks_test.go index 0860f47533..2186933bd9 100644 --- a/tests/integration/api_repo_lfs_locks_test.go +++ b/tests/integration/api_repo_lfs_locks_test.go @@ -112,6 +112,7 @@ func TestAPILFSLocksLogged(t *testing.T) { if len(test.addTime) > 0 { var lfsLock api.LFSLockResponse DecodeJSON(t, resp, &lfsLock) + assert.Equal(t, test.user.Name, lfsLock.Lock.Owner.Name) assert.EqualValues(t, lfsLock.Lock.LockedAt.Format(time.RFC3339), lfsLock.Lock.LockedAt.Format(time.RFC3339Nano)) // locked at should be rounded to second for _, id := range test.addTime { resultsTests[id].locksTimes = append(resultsTests[id].locksTimes, time.Now()) @@ -129,7 +130,7 @@ func TestAPILFSLocksLogged(t *testing.T) { DecodeJSON(t, resp, &lfsLocks) assert.Len(t, lfsLocks.Locks, test.totalCount) for i, lock := range lfsLocks.Locks { - assert.EqualValues(t, test.locksOwners[i].DisplayName(), lock.Owner.Name) + assert.EqualValues(t, test.locksOwners[i].Name, lock.Owner.Name) assert.WithinDuration(t, test.locksTimes[i], lock.LockedAt, 10*time.Second) assert.EqualValues(t, lock.LockedAt.Format(time.RFC3339), lock.LockedAt.Format(time.RFC3339Nano)) // locked at should be rounded to second } @@ -143,7 +144,7 @@ func TestAPILFSLocksLogged(t *testing.T) { assert.Len(t, lfsLocksVerify.Ours, test.oursCount) assert.Len(t, lfsLocksVerify.Theirs, test.theirsCount) for _, lock := range lfsLocksVerify.Ours { - assert.EqualValues(t, test.user.DisplayName(), lock.Owner.Name) + assert.EqualValues(t, test.user.Name, lock.Owner.Name) deleteTests = append(deleteTests, struct { user *user_model.User repo *repo_model.Repository @@ -165,7 +166,7 @@ func TestAPILFSLocksLogged(t *testing.T) { var lfsLockRep api.LFSLockResponse DecodeJSON(t, resp, &lfsLockRep) assert.Equal(t, test.lockID, lfsLockRep.Lock.ID) - assert.Equal(t, test.user.DisplayName(), lfsLockRep.Lock.Owner.Name) + assert.Equal(t, test.user.Name, lfsLockRep.Lock.Owner.Name) } // check that we don't have any lock |