fix tag-only button logic

Author: wxiaoguang

routers/web/repo/release.go

@@ -360,6 +360,8 @@ func NewRelease(ctx *context.Context) {
 		return
 	}
 
+	ctx.Data["ShowCreateTagOnlyButton"] = true
+
 	// pre-fill the form with the tag name, target branch and the existing release (if exists)
 	ctx.Data["tag_target"] = ctx.Repo.Repository.DefaultBranch
 	if tagName := ctx.FormString("tag"); tagName != "" {
@@ -376,7 +378,7 @@ func NewRelease(ctx *context.Context) {
 				return
 			}
 
-			ctx.Data["TagNameReleaseExists"] = true
+			ctx.Data["ShowCreateTagOnlyButton"] = false
 			ctx.Data["tag_name"] = rel.TagName
 			ctx.Data["tag_target"] = rel.Target
 			ctx.Data["title"] = rel.Title
@@ -397,14 +399,17 @@ func NewReleasePost(ctx *context.Context) {
 
 	form := web.GetForm(ctx).(*forms.NewReleaseForm)
 
-	// first, check whether the release exists,
-	// it should be done before the form error check, because the tmpl needs "TagNameReleaseExists" to show/hide the "tag only" button
+	// first, check whether the release exists, and prepare "ShowCreateTagOnlyButton"
+	// the logic should be done before the form error check to make the tmpl has correct variables
 	rel, err := repo_model.GetRelease(ctx, ctx.Repo.Repository.ID, form.TagName)
 	if err != nil && !repo_model.IsErrReleaseNotExist(err) {
 		ctx.ServerError("GetRelease", err)
 		return
 	}
-	ctx.Data["TagNameReleaseExists"] = rel != nil
+
+	// we should still show the "tag only" button if the user clicks it, no matter the release exists or not.
+	// because if error occurs, end users need to have the chance to edit the name and submit the form with "tag-only" again.
+	ctx.Data["ShowCreateTagOnlyButton"] = form.TagOnly || rel == nil
 
 	// do some form checks
 	if ctx.HasError() {

routers/web/repo/release_test.go

@@ -34,9 +34,9 @@ func TestNewReleasePost(t *testing.T) {
 
 	t.Run("NewReleasePage", func(t *testing.T) {
 		ctx := get(t, "v1.1")
-		assert.NotEmpty(t, ctx.Data["TagNameReleaseExists"])
+		assert.Empty(t, ctx.Data["ShowCreateTagOnlyButton"])
 		ctx = get(t, "new-tag-name")
-		assert.Empty(t, ctx.Data["TagNameReleaseExists"])
+		assert.NotEmpty(t, ctx.Data["ShowCreateTagOnlyButton"])
 	})
 
 	post := func(t *testing.T, form forms.NewReleaseForm) *context.Context {

templates/repo/release/new.tmpl

@@ -115,7 +115,7 @@
 								<button class="ui small primary button">{{ctx.Locale.Tr "repo.release.edit_release"}}</button>
 							{{end}}
 						{{else}}
-							{{if not .TagNameReleaseExists}}
+							{{if .ShowCreateTagOnlyButton}}
 								<button class="ui small button" name="tag_only" value="1">{{ctx.Locale.Tr "repo.release.add_tag"}}</button>
 							{{end}}
 							<button class="ui small button" name="draft" value="1">{{ctx.Locale.Tr "repo.release.save_draft"}}</button>