File tree 5 files changed +23
-8
lines changed
5 files changed +23
-8
lines changed Original file line number Diff line number Diff line change @@ -185,6 +185,11 @@ func Releases(ctx *context.Context) {
185
185
ctx .ServerError ("getReleaseInfos" , err )
186
186
return
187
187
}
188
+ for _ , rel := range releases {
189
+ if rel .Release .IsTag && rel .Release .Title == "" {
190
+ rel .Release .Title = rel .Release .TagName
191
+ }
192
+ }
188
193
189
194
ctx .Data ["Releases" ] = releases
190
195
@@ -283,6 +288,7 @@ func SingleRelease(ctx *context.Context) {
283
288
TagNames : []string {ctx .Params ("*" )},
284
289
// only show draft releases for users who can write, read-only users shouldn't see draft releases.
285
290
IncludeDrafts : writeAccess ,
291
+ IncludeTags : true ,
286
292
})
287
293
if err != nil {
288
294
ctx .ServerError ("getReleaseInfos" , err )
@@ -294,6 +300,9 @@ func SingleRelease(ctx *context.Context) {
294
300
}
295
301
296
302
release := releases [0 ].Release
303
+ if release .IsTag && release .Title == "" {
304
+ release .Title = release .TagName
305
+ }
297
306
298
307
ctx .Data ["PageIsSingleTag" ] = release .IsTag
299
308
if release .IsTag {
Original file line number Diff line number Diff line change 18
18
<div class="ui twelve wide column detail">
19
19
<div class="gt-df gt-ac gt-sb gt-fw gt-mb-3">
20
20
<h4 class="release-list-title gt-word-break">
21
- <a href="{{$.RepoLink}}/releases/tag/{{$release.TagName | PathEscapeSegments}}">{{$release.Title}}</a>
21
+ {{if $.PageIsSingleTag}}{{$release.Title}}{{else}} <a href="{{$.RepoLink}}/releases/tag/{{$release.TagName | PathEscapeSegments}}">{{$release.Title}}</a>{{end}}
22
22
{{template "repo/commit_statuses" dict "Status" $info.CommitStatus "Statuses" $info.CommitStatuses "AdditionalClasses" "gt-df"}}
23
23
{{if $release.IsDraft}}
24
24
<span class="ui yellow label">{{ctx.Locale.Tr "repo.release.draft"}}</span>
25
25
{{else if $release.IsPrerelease}}
26
26
<span class="ui orange label">{{ctx.Locale.Tr "repo.release.prerelease"}}</span>
27
- {{else}}
27
+ {{else if (not $release.IsTag) }}
28
28
<span class="ui green label">{{ctx.Locale.Tr "repo.release.stable"}}</span>
29
29
{{end}}
30
30
</h4>
31
31
<div>
32
- {{if $.CanCreateRelease}}
32
+ {{if and $.CanCreateRelease (not $.PageIsSingleTag) }}
33
33
<a class="muted" data-tooltip-content="{{ctx.Locale.Tr "repo.release.edit"}}" href="{{$.RepoLink}}/releases/edit/{{$release.TagName | PathEscapeSegments}}" rel="nofollow">
34
34
{{svg "octicon-pencil"}}
35
35
</a>
Original file line number Diff line number Diff line change 5
5
<div class="gt-df">
6
6
<div class="gt-f1 gt-df gt-ac">
7
7
<h2 class="ui compact small menu header small-menu-items">
8
- <a class="{{if .PageIsReleaseList}}active {{end}}item" href="{{.RepoLink}}/releases">{{ctx.Locale.PrettyNumber .NumReleases}} {{ctx.Locale.TrN .NumReleases "repo.release" "repo.releases"}}</a>
8
+ <a class="{{if and .PageIsReleaseList (not .PageIsSingleTag) }}active {{end}}item" href="{{.RepoLink}}/releases">{{ctx.Locale.PrettyNumber .NumReleases}} {{ctx.Locale.TrN .NumReleases "repo.release" "repo.releases"}}</a>
9
9
{{if $canReadCode}}
10
- <a class="{{if .PageIsTagList}}active {{end}}item" href="{{.RepoLink}}/tags">{{ctx.Locale.PrettyNumber .NumTags}} {{ctx.Locale.TrN .NumTags "repo.tag" "repo.tags"}}</a>
10
+ <a class="{{if or .PageIsTagList .PageIsSingleTag }}active {{end}}item" href="{{.RepoLink}}/tags">{{ctx.Locale.PrettyNumber .NumTags}} {{ctx.Locale.TrN .NumTags "repo.tag" "repo.tags"}}</a>
11
11
{{end}}
12
12
</h2>
13
13
</div>
17
17
</a>
18
18
{{end}}
19
19
{{if and (not .PageIsTagList) .CanCreateRelease}}
20
- <a class="ui small primary button" href="{{$.RepoLink}}/releases/new">
20
+ <a class="ui small primary button" href="{{$.RepoLink}}/releases/new{{if .PageIsSingleTag}}?tag={{.TagName}}{{end}} ">
21
21
{{ctx.Locale.Tr "repo.release.new_release"}}
22
22
</a>
23
23
{{end}}
Original file line number Diff line number Diff line change @@ -36,6 +36,7 @@ func TestLinksNoLogin(t *testing.T) {
36
36
"/user2/repo1/" ,
37
37
"/user2/repo1/projects" ,
38
38
"/user2/repo1/projects/1" ,
39
+ "/user2/repo1/releases/tag/delete-tag" , // It's the only one existing record on release.yml which has is_tag: true
39
40
"/assets/img/404.png" ,
40
41
"/assets/img/500.png" ,
41
42
"/.well-known/security.txt" ,
Original file line number Diff line number Diff line change @@ -30,8 +30,9 @@ function initTagNameEditor() {
30
30
const newTagHelperText = el . getAttribute ( 'data-tag-helper-new' ) ;
31
31
const existingTagHelperText = el . getAttribute ( 'data-tag-helper-existing' ) ;
32
32
33
- document . getElementById ( 'tag-name' ) . addEventListener ( 'keyup' , ( e ) => {
34
- const value = e . target . value ;
33
+ const tagNameInput = document . getElementById ( 'tag-name' ) ;
34
+ const hideTargetInput = function ( tagNameInput ) {
35
+ const value = tagNameInput . value ;
35
36
const tagHelper = document . getElementById ( 'tag-helper' ) ;
36
37
if ( existingTags . includes ( value ) ) {
37
38
// If the tag already exists, hide the target branch selector.
@@ -41,6 +42,10 @@ function initTagNameEditor() {
41
42
showElem ( '#tag-target-selector' ) ;
42
43
tagHelper . textContent = value ? newTagHelperText : defaultTagHelperText ;
43
44
}
45
+ } ;
46
+ hideTargetInput ( tagNameInput ) ; // update on page load because the input may have a value
47
+ tagNameInput . addEventListener ( 'input' , ( e ) => {
48
+ hideTargetInput ( e . target ) ;
44
49
} ) ;
45
50
}
46
51
You can’t perform that action at this time.
0 commit comments