mirror of
				https://gitee.com/gitea/gitea
				synced 2025-11-04 08:30:25 +08:00 
			
		
		
		
	* add util method and tests * make sure the title of an issue cannot be empty * wiki title cannot be empty * pull request title cannot be empty * update to make use of the new util methof
This commit is contained in:
		@@ -9,10 +9,11 @@ package cmd
 | 
			
		||||
import (
 | 
			
		||||
	"errors"
 | 
			
		||||
	"fmt"
 | 
			
		||||
	"strings"
 | 
			
		||||
 | 
			
		||||
	"code.gitea.io/gitea/models"
 | 
			
		||||
	"code.gitea.io/gitea/modules/setting"
 | 
			
		||||
	"code.gitea.io/gitea/modules/util"
 | 
			
		||||
 | 
			
		||||
	"github.com/urfave/cli"
 | 
			
		||||
)
 | 
			
		||||
 | 
			
		||||
@@ -24,7 +25,7 @@ func argsSet(c *cli.Context, args ...string) error {
 | 
			
		||||
			return errors.New(a + " is not set")
 | 
			
		||||
		}
 | 
			
		||||
 | 
			
		||||
		if len(strings.TrimSpace(c.String(a))) == 0 {
 | 
			
		||||
		if util.IsEmptyString(a) {
 | 
			
		||||
			return errors.New(a + " is required")
 | 
			
		||||
		}
 | 
			
		||||
	}
 | 
			
		||||
 
 | 
			
		||||
@@ -98,3 +98,8 @@ func Min(a, b int) int {
 | 
			
		||||
	}
 | 
			
		||||
	return a
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
// IsEmptyString checks if the provided string is empty
 | 
			
		||||
func IsEmptyString(s string) bool {
 | 
			
		||||
	return len(strings.TrimSpace(s)) == 0
 | 
			
		||||
}
 | 
			
		||||
 
 | 
			
		||||
@@ -77,3 +77,20 @@ func TestIsExternalURL(t *testing.T) {
 | 
			
		||||
		assert.Equal(t, test.Expected, IsExternalURL(test.RawURL))
 | 
			
		||||
	}
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
func TestIsEmptyString(t *testing.T) {
 | 
			
		||||
 | 
			
		||||
	cases := []struct {
 | 
			
		||||
		s        string
 | 
			
		||||
		expected bool
 | 
			
		||||
	}{
 | 
			
		||||
		{"", true},
 | 
			
		||||
		{" ", true},
 | 
			
		||||
		{"   ", true},
 | 
			
		||||
		{"  a", false},
 | 
			
		||||
	}
 | 
			
		||||
 | 
			
		||||
	for _, v := range cases {
 | 
			
		||||
		assert.Equal(t, v.expected, IsEmptyString(v.s))
 | 
			
		||||
	}
 | 
			
		||||
}
 | 
			
		||||
 
 | 
			
		||||
@@ -655,6 +655,7 @@ ext_issues.desc = Link to an external issue tracker.
 | 
			
		||||
 | 
			
		||||
issues.desc = Organize bug reports, tasks and milestones.
 | 
			
		||||
issues.new = New Issue
 | 
			
		||||
issues.new.title_empty = Title cannot be empty
 | 
			
		||||
issues.new.labels = Labels
 | 
			
		||||
issues.new.no_label = No Label
 | 
			
		||||
issues.new.clear_labels = Clear labels
 | 
			
		||||
 
 | 
			
		||||
@@ -355,7 +355,7 @@ func setTemplateIfExists(ctx *context.Context, ctxDataKey string, possibleFiles
 | 
			
		||||
	}
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
// NewIssue render createing issue page
 | 
			
		||||
// NewIssue render creating issue page
 | 
			
		||||
func NewIssue(ctx *context.Context) {
 | 
			
		||||
	ctx.Data["Title"] = ctx.Tr("repo.issues.new")
 | 
			
		||||
	ctx.Data["PageIsIssueList"] = true
 | 
			
		||||
@@ -494,6 +494,11 @@ func NewIssuePost(ctx *context.Context, form auth.CreateIssueForm) {
 | 
			
		||||
		return
 | 
			
		||||
	}
 | 
			
		||||
 | 
			
		||||
	if util.IsEmptyString(form.Title) {
 | 
			
		||||
		ctx.RenderWithErr(ctx.Tr("repo.issues.new.title_empty"), tplIssueNew, form)
 | 
			
		||||
		return
 | 
			
		||||
	}
 | 
			
		||||
 | 
			
		||||
	issue := &models.Issue{
 | 
			
		||||
		RepoID:      repo.ID,
 | 
			
		||||
		Title:       form.Title,
 | 
			
		||||
 
 | 
			
		||||
@@ -22,6 +22,7 @@ import (
 | 
			
		||||
	"code.gitea.io/gitea/modules/log"
 | 
			
		||||
	"code.gitea.io/gitea/modules/notification"
 | 
			
		||||
	"code.gitea.io/gitea/modules/setting"
 | 
			
		||||
	"code.gitea.io/gitea/modules/util"
 | 
			
		||||
 | 
			
		||||
	"github.com/Unknwon/com"
 | 
			
		||||
)
 | 
			
		||||
@@ -860,6 +861,16 @@ func CompareAndPullRequestPost(ctx *context.Context, form auth.CreateIssueForm)
 | 
			
		||||
		return
 | 
			
		||||
	}
 | 
			
		||||
 | 
			
		||||
	if util.IsEmptyString(form.Title) {
 | 
			
		||||
		PrepareCompareDiff(ctx, headUser, headRepo, headGitRepo, prInfo, baseBranch, headBranch)
 | 
			
		||||
		if ctx.Written() {
 | 
			
		||||
			return
 | 
			
		||||
		}
 | 
			
		||||
 | 
			
		||||
		ctx.RenderWithErr(ctx.Tr("repo.issues.new.title_empty"), tplComparePull, form)
 | 
			
		||||
		return
 | 
			
		||||
	}
 | 
			
		||||
 | 
			
		||||
	patch, err := headGitRepo.GetPatch(prInfo.MergeBase, headBranch)
 | 
			
		||||
	if err != nil {
 | 
			
		||||
		ctx.ServerError("GetPatch", err)
 | 
			
		||||
 
 | 
			
		||||
@@ -341,6 +341,11 @@ func NewWikiPost(ctx *context.Context, form auth.NewWikiForm) {
 | 
			
		||||
		return
 | 
			
		||||
	}
 | 
			
		||||
 | 
			
		||||
	if util.IsEmptyString(form.Title) {
 | 
			
		||||
		ctx.RenderWithErr(ctx.Tr("repo.issues.new.title_empty"), tplWikiNew, form)
 | 
			
		||||
		return
 | 
			
		||||
	}
 | 
			
		||||
 | 
			
		||||
	wikiName := models.NormalizeWikiName(form.Title)
 | 
			
		||||
	if err := ctx.Repo.Repository.AddWikiPage(ctx.User, wikiName, form.Content, form.Message); err != nil {
 | 
			
		||||
		if models.IsErrWikiReservedName(err) {
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user