diff options
| author | 6543 <24977596+6543@users.noreply.github.com> | 2019-10-15 00:40:17 +0200 |
|---|---|---|
| committer | zeripath <art27@cantab.net> | 2019-10-14 23:40:17 +0100 |
| commit | 733c898a907b23fa9e0c1bf108be5c5d9f9f7eb0 (patch) | |
| tree | 4f4d42b141cd64efb9ebe7a213438088fdbef0e9 | |
| parent | 0be992a1e26f61a182113266a2eb34f77b87f9b4 (diff) | |
| download | gitea-733c898a907b23fa9e0c1bf108be5c5d9f9f7eb0.tar.gz gitea-733c898a907b23fa9e0c1bf108be5c5d9f9f7eb0.zip | |
[Branch View] Add Included TAG (#8449)
* included message
* add property IsIncluded
* Add Orange Lable
| -rw-r--r-- | options/locale/locale_en-US.ini | 2 | ||||
| -rw-r--r-- | routers/repo/branch.go | 4 | ||||
| -rw-r--r-- | templates/repo/branch/list.tmpl | 6 |
3 files changed, 11 insertions, 1 deletions
diff --git a/options/locale/locale_en-US.ini b/options/locale/locale_en-US.ini index 4a92b08030..b5a3d8c592 100644 --- a/options/locale/locale_en-US.ini +++ b/options/locale/locale_en-US.ini @@ -1453,6 +1453,8 @@ branch.restore_failed = Failed to restore branch '%s'. branch.protected_deletion_failed = Branch '%s' is protected. It cannot be deleted. branch.restore = Restore Branch '%s' branch.download = Download Branch '%s' +branch.included_desc = This branch is part of the default branch +branch.included = Included topic.manage_topics = Manage Topics topic.done = Done diff --git a/routers/repo/branch.go b/routers/repo/branch.go index 5d78518491..0c06de3ea6 100644 --- a/routers/repo/branch.go +++ b/routers/repo/branch.go @@ -28,6 +28,7 @@ type Branch struct { Commit *git.Commit IsProtected bool IsDeleted bool + IsIncluded bool DeletedBranch *models.DeletedBranch CommitsAhead int CommitsBehind int @@ -203,10 +204,13 @@ func loadBranches(ctx *context.Context) []*Branch { } } + isIncluded := divergence.Ahead == 0 && ctx.Repo.Repository.DefaultBranch != branchName + branches[i] = &Branch{ Name: branchName, Commit: commit, IsProtected: isProtected, + IsIncluded: isIncluded, CommitsAhead: divergence.Ahead, CommitsBehind: divergence.Behind, LatestPullRequest: pr, diff --git a/templates/repo/branch/list.tmpl b/templates/repo/branch/list.tmpl index 9c53f4e67a..26493298da 100644 --- a/templates/repo/branch/list.tmpl +++ b/templates/repo/branch/list.tmpl @@ -75,7 +75,11 @@ </td> <td class="two wide right aligned"> {{if not .LatestPullRequest}} - {{if and (not .IsDeleted) $.AllowsPulls (gt .CommitsAhead 0)}} + {{if .IsIncluded}} + <a class="ui poping up orange small label" data-content="{{$.i18n.Tr "repo.branch.included_desc"}}" data-variation="tiny inverted" data-position="top right"> + <i class="octicon octicon-git-pull-request"></i> {{$.i18n.Tr "repo.branch.included"}} + </a> + {{else if and (not .IsDeleted) $.AllowsPulls (gt .CommitsAhead 0)}} <a href="{{$.RepoLink}}/compare/{{$.DefaultBranch | EscapePound}}...{{if ne $.Repository.Owner.Name $.Owner.Name}}{{$.Owner.Name}}:{{end}}{{.Name | EscapePound}}"> <button id="new-pull-request" class="ui compact basic button">{{$.i18n.Tr "repo.pulls.compare_changes"}}</button> </a> |