aniani/gitea
1
0
Fork 0
mirror of https://github.com/go-gitea/gitea.git synced 2024-11-04 08:17:24 -05:00
Code

Some fixes of the prompt of new branches (#26257)

Browse Source 
Related to #26239

This PR makes some fixes:
- do not show the prompt for mirror repos and repos with pull request
units disabled
- use `commit_time` instead of `updated_unix`, as `commit_time` is the
real time when the branch was pushed
This commit is contained in:
Zettat123 2023-08-01 15:25:11 +08:00 committed by GitHub
parent b9baed2c74
commit 9a65d011f6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 15 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
models/git/branch.go
View File

@ -395,9 +395,9 @@ func FindRecentlyPushedNewBranches(ctx context.Context, repoID, userID int64, ex
Where("pusher_id=? AND is_deleted=?", userID, false). Where("pusher_id=? AND is_deleted=?", userID, false).
And("name <> ?", excludeBranchName). And("name <> ?", excludeBranchName).
And("repo_id = ?", repoID). And("repo_id = ?", repoID).
And("updated_unix >= ?", time.Now().Add(-time.Hour*6).Unix()). And("commit_time >= ?", time.Now().Add(-time.Hour*6).Unix()).
NotIn("name", subQuery). NotIn("name", subQuery).
OrderBy("branch.updated_unix DESC"). OrderBy("branch.commit_time DESC").
Limit(2). Limit(2).
Find(&branches) Find(&branches)
return branches, err return branches, err

8
routers/web/repo/view.go
View File

@ -999,12 +999,20 @@ func renderCode(ctx *context.Context) {
ctx.ServerError("GetBaseRepo", err) ctx.ServerError("GetBaseRepo", err)
return return
} }
showRecentlyPushedNewBranches := true
if ctx.Repo.Repository.IsMirror ||
!ctx.Repo.Repository.UnitEnabled(ctx, unit_model.TypePullRequests) {
showRecentlyPushedNewBranches = false
}
if showRecentlyPushedNewBranches {
ctx.Data["RecentlyPushedNewBranches"], err = git_model.FindRecentlyPushedNewBranches(ctx, ctx.Repo.Repository.ID, ctx.Doer.ID, ctx.Repo.Repository.DefaultBranch) ctx.Data["RecentlyPushedNewBranches"], err = git_model.FindRecentlyPushedNewBranches(ctx, ctx.Repo.Repository.ID, ctx.Doer.ID, ctx.Repo.Repository.DefaultBranch)
if err != nil { if err != nil {
ctx.ServerError("GetRecentlyPushedBranches", err) ctx.ServerError("GetRecentlyPushedBranches", err)
return return
} }
} }
}
var treeNames []string var treeNames []string
paths := make([]string, 0, 5) paths := make([]string, 0, 5)

2
templates/repo/code/recently_pushed_new_branches.tmpl
View File

@ -1,7 +1,7 @@
{{range .RecentlyPushedNewBranches}} {{range .RecentlyPushedNewBranches}}
<div class="ui positive message gt-df gt-ac"> <div class="ui positive message gt-df gt-ac">
<div class="gt-f1"> <div class="gt-f1">
{{$timeSince := TimeSince .UpdatedUnix.AsTime $.locale}} {{$timeSince := TimeSince .CommitTime.AsTime $.locale}}
{{$.locale.Tr "repo.pulls.recently_pushed_new_branches" (PathEscapeSegments .Name) $timeSince | Safe}} {{$.locale.Tr "repo.pulls.recently_pushed_new_branches" (PathEscapeSegments .Name) $timeSince | Safe}}
</div> </div>
<a aria-role="button" class="ui compact positive button gt-m-0" href="{{$.Repository.ComposeBranchCompareURL $.Repository.BaseRepo (PathEscapeSegments .Name)}}"> <a aria-role="button" class="ui compact positive button gt-m-0" href="{{$.Repository.ComposeBranchCompareURL $.Repository.BaseRepo (PathEscapeSegments .Name)}}">