davrot/forgejo_backup
1
0
Fork 0
mirror of https://codeberg.org/davrot/forgejo.git synced 2025-06-26 17:00:04 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Show lock owner instead of repo owner on LFS setting page (#31788) (#31817)

Browse source 
Backport #31788 by @wolfogre

Fix #31784.

Before:

<img width="1648" alt="image"
src="https://github.com/user-attachments/assets/03f32545-4a85-42ed-bafc-2b193a5d8023">

After:

<img width="1653" alt="image"
src="https://github.com/user-attachments/assets/e5bcaf93-49cb-421f-aac1-5122bc488b02">

Co-authored-by: Jason Song <i@wolfogre.com>
(cherry picked from commit a39fe5325266f1c079e0e54abc68e6470764eb44)

Conflicts:
	models/git/lfs_lock.go
  trivial context conflict
This commit is contained in:
Giteabot 2024-08-11 23:17:34 +08:00 • committed by Earl Warren
parent 8e8a07cc15
commit 4c5e4e672d
No known key found for this signature in database
GPG key ID: 0579CB2928A78A00
5 changed files with 161 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

5
routers/web/repo/setting/lfs.go
View file

@ -95,6 +95,11 @@ func LFSLocks(ctx *context.Context) {
ctx.ServerError("LFSLocks", err)
return
}
if err := lfsLocks.LoadAttributes(ctx); err != nil {
ctx.ServerError("LFSLocks", err)
return
}
ctx.Data["LFSLocks"] = lfsLocks
if len(lfsLocks) == 0 {