From 74bd6b939c725e6e9c7395fe6356e9a6d7d662e6 Mon Sep 17 00:00:00 2001 From: Unknwon Date: Wed, 5 Aug 2015 18:26:18 +0800 Subject: milestone: edit --- models/error.go | 21 +++++++++++++++++++++ models/issue.go | 5 ++--- 2 files changed, 23 insertions(+), 3 deletions(-) (limited to 'models') diff --git a/models/error.go b/models/error.go index 04f850de..01adeb42 100644 --- a/models/error.go +++ b/models/error.go @@ -134,3 +134,24 @@ func IsErrRepoNotExist(err error) bool { func (err ErrRepoNotExist) Error() string { return fmt.Sprintf("repository does not exist [id: %d, uid: %d, name: %s]", err.ID, err.UID, err.Name) } + +// _____ .__.__ __ +// / \ |__| | ____ _______/ |_ ____ ____ ____ +// / \ / \| | | _/ __ \ / ___/\ __\/ _ \ / \_/ __ \ +// / Y \ | |_\ ___/ \___ \ | | ( <_> ) | \ ___/ +// \____|__ /__|____/\___ >____ > |__| \____/|___| /\___ > +// \/ \/ \/ \/ \/ + +type ErrMilestoneNotExist struct { + ID int64 + Index int64 +} + +func IsErrMilestoneNotExist(err error) bool { + _, ok := err.(ErrMilestoneNotExist) + return ok +} + +func (err ErrMilestoneNotExist) Error() string { + return fmt.Sprintf("milestone does not exist [id: %d, index: %d]", err.ID, err.Index) +} diff --git a/models/issue.go b/models/issue.go index 0835d1c9..44988a32 100644 --- a/models/issue.go +++ b/models/issue.go @@ -23,7 +23,6 @@ import ( var ( ErrIssueNotExist = errors.New("Issue does not exist") ErrLabelNotExist = errors.New("Label does not exist") - ErrMilestoneNotExist = errors.New("Milestone does not exist") ErrWrongIssueCounter = errors.New("Invalid number of issues for this milestone") ErrAttachmentNotExist = errors.New("Attachment does not exist") ErrAttachmentNotLinked = errors.New("Attachment does not belong to this issue") @@ -691,7 +690,7 @@ func MilestoneById(id int64) (*Milestone, error) { if err != nil { return nil, err } else if !has { - return nil, ErrMilestoneNotExist + return nil, ErrMilestoneNotExist{id, 0} } return m, nil } @@ -703,7 +702,7 @@ func GetMilestoneByIndex(repoId, idx int64) (*Milestone, error) { if err != nil { return nil, err } else if !has { - return nil, ErrMilestoneNotExist + return nil, ErrMilestoneNotExist{0, idx} } return m, nil } -- cgit v1.2.3