#3290 better code structure and batch minor improvements

README.md

@@ -3,7 +3,7 @@ Gogs - Go Git Service [![Build Status](https://travis-ci.org/gogits/gogs.svg?bra
 
 ![](https://github.com/gogits/gogs/blob/master/public/img/gogs-large-resize.png?raw=true)
 
-##### Current tip version: 0.9.59 (see [Releases](https://github.com/gogits/gogs/releases) for binary versions)
+##### Current tip version: 0.9.60 (see [Releases](https://github.com/gogits/gogs/releases) for binary versions)
 
 | Web | UI  | Preview  |
 |:-------------:|:-------:|:-------:|

cmd/web.go

@@ -88,7 +88,7 @@ func checkVersion() {
 		{"gopkg.in/ini.v1", ini.Version, "1.8.4"},
 		{"gopkg.in/macaron.v1", macaron.Version, "1.1.4"},
 		{"github.com/gogits/git-module", git.Version, "0.3.3"},
-		{"github.com/gogits/go-gogs-client", gogs.Version, "0.7.4"},
+		{"github.com/gogits/go-gogs-client", gogs.Version, "0.10.1"},
 	}
 	for _, c := range checkers {
 		if !version.Compare(c.Version(), c.Expected, ">=") {

gogs.go

@@ -17,7 +17,7 @@ import (
 	"github.com/gogits/gogs/modules/setting"
 )
 
-const APP_VER = "0.9.59.0730"
+const APP_VER = "0.9.60.0803"
 
 func init() {
 	runtime.GOMAXPROCS(runtime.NumCPU())

models/error.go

@@ -5,7 +5,6 @@
 package models
 
 import (
-	"bytes"
 	"fmt"
 )
 
@@ -35,30 +34,6 @@ func (err ErrNamePatternNotAllowed) Error() string {
 	return fmt.Sprintf("name pattern is not allowed [pattern: %s]", err.Pattern)
 }
 
-type ErrMultipleErrors struct {
-	Errors []error
-}
-
-func IsErrMultipleErrors(err error) bool {
-	_, ok := err.(ErrMultipleErrors)
-	return ok
-}
-
-func (err ErrMultipleErrors) Error() string {
-	var message bytes.Buffer
-
-	message.WriteString("Multiple errors encountered: ")
-
-	for i := range err.Errors {
-		message.WriteString(err.Errors[i].Error())
-		if i < len(err.Errors)-1 {
-			message.WriteString("; ")
-		}
-	}
-
-	return message.String()
-}
-
 //  ____ ___
 // |    |   \______ ___________
 // |    |   /  ___// __ \_  __ \
@@ -558,7 +533,8 @@ func (err ErrCommentNotExist) Error() string {
 //         \/    \/    \/     \/
 
 type ErrLabelNotExist struct {
-	ID int64
+	LabelID int64
+	RepoID  int64
 }
 
 func IsErrLabelNotExist(err error) bool {
@@ -567,21 +543,7 @@ func IsErrLabelNotExist(err error) bool {
 }
 
 func (err ErrLabelNotExist) Error() string {
-	return fmt.Sprintf("label does not exist [id: %d]", err.ID)
-}
-
-type ErrLabelNotValidForRepository struct {
-	ID     int64
-	RepoID int64
-}
-
-func IsErrLabelNotValidForRepository(err error) bool {
-	_, ok := err.(ErrLabelNotValidForRepository)
-	return ok
-}
-
-func (err ErrLabelNotValidForRepository) Error() string {
-	return fmt.Sprintf("label is not valid for repository [label_id: %d, repo_id: %d]", err.ID, err.RepoID)
+	return fmt.Sprintf("label does not exist [label_id: %d, repo_id: %d]", err.LabelID, err.RepoID)
 }
 
 //    _____  .__.__                   __

models/issue.go

@@ -181,7 +181,7 @@ func (i *Issue) addLabel(e *xorm.Session, label *Label) error {
 	return newIssueLabel(e, i, label)
 }
 
-// AddLabel adds new label to issue by given ID.
+// AddLabel adds a new label to the issue.
 func (i *Issue) AddLabel(label *Label) (err error) {
 	sess := x.NewSession()
 	defer sessionRelease(sess)
@@ -196,52 +196,76 @@ func (i *Issue) AddLabel(label *Label) (err error) {
 	return sess.Commit()
 }
 
-func (i *Issue) getLabels(e Engine) (err error) {
-	if len(i.Labels) > 0 {
+func (issue *Issue) addLabels(e *xorm.Session, labels []*Label) error {
+	return newIssueLabels(e, issue, labels)
+}
+
+// AddLabels adds a list of new labels to the issue.
+func (issue *Issue) AddLabels(labels []*Label) error {
+	return NewIssueLabels(issue, labels)
+}
+
+func (issue *Issue) getLabels(e Engine) (err error) {
+	if len(issue.Labels) > 0 {
 		return nil
 	}
 
-	i.Labels, err = getLabelsByIssueID(e, i.ID)
+	issue.Labels, err = getLabelsByIssueID(e, issue.ID)
 	if err != nil {
 		return fmt.Errorf("getLabelsByIssueID: %v", err)
 	}
 	return nil
 }
 
-func (i *Issue) removeLabel(e *xorm.Session, label *Label) error {
-	return deleteIssueLabel(e, i, label)
+func (issue *Issue) removeLabel(e *xorm.Session, label *Label) error {
+	return deleteIssueLabel(e, issue, label)
 }
 
 // RemoveLabel removes a label from issue by given ID.
-func (i *Issue) RemoveLabel(label *Label) (err error) {
+func (issue *Issue) RemoveLabel(label *Label) (err error) {
+	return DeleteIssueLabel(issue, label)
+}
+
+func (issue *Issue) clearLabels(e *xorm.Session) (err error) {
+	if err = issue.getLabels(e); err != nil {
+		return fmt.Errorf("getLabels: %v", err)
+	}
+
+	for i := range issue.Labels {
+		if err = issue.removeLabel(e, issue.Labels[i]); err != nil {
+			return fmt.Errorf("removeLabel: %v", err)
+		}
+	}
+
+	return nil
+}
+
+func (issue *Issue) ClearLabels() (err error) {
 	sess := x.NewSession()
 	defer sessionRelease(sess)
 	if err = sess.Begin(); err != nil {
 		return err
 	}
 
-	if err = i.removeLabel(sess, label); err != nil {
+	if err = issue.clearLabels(sess); err != nil {
 		return err
 	}
 
 	return sess.Commit()
 }
 
-func (i *Issue) ClearLabels() (err error) {
+// ReplaceLabels removes all current labels and add new labels to the issue.
+func (issue *Issue) ReplaceLabels(labels []*Label) (err error) {
 	sess := x.NewSession()
 	defer sessionRelease(sess)
 	if err = sess.Begin(); err != nil {
 		return err
 	}
 
-	if err = i.getLabels(sess); err != nil {
-		return err
-	}
-
-	for idx := range i.Labels {
-		if err = i.removeLabel(sess, i.Labels[idx]); err != nil {
-			return err
-		}
+	if err = issue.clearLabels(sess); err != nil {
+		return fmt.Errorf("clearLabels: %v", err)
+	} else if err = issue.addLabels(sess, labels); err != nil {
+		return fmt.Errorf("addLabels: %v", err)
 	}
 
 	return sess.Commit()

models/issue_label.go

@@ -11,6 +11,8 @@ import (
 	"strings"
 
 	"github.com/go-xorm/xorm"
+
+	"github.com/gogits/gogs/modules/base"
 )
 
 // Label represents a label of repository for issues.
@@ -56,48 +58,65 @@ func NewLabel(l *Label) error {
 	return err
 }
 
-func getLabelByID(e Engine, id int64) (*Label, error) {
-	if id <= 0 {
-		return nil, ErrLabelNotExist{id}
+// getLabelInRepoByID returns a label by ID in given repository.
+// If pass repoID as 0, then ORM will ignore limitation of repository
+// and can return arbitrary label with any valid ID.
+func getLabelInRepoByID(e Engine, repoID, labelID int64) (*Label, error) {
+	if labelID <= 0 {
+		return nil, ErrLabelNotExist{labelID, repoID}
 	}
 
-	l := &Label{ID: id}
+	l := &Label{
+		ID:     labelID,
+		RepoID: repoID,
+	}
 	has, err := x.Get(l)
 	if err != nil {
 		return nil, err
 	} else if !has {
-		return nil, ErrLabelNotExist{l.ID}
+		return nil, ErrLabelNotExist{l.ID, l.RepoID}
 	}
 	return l, nil
 }
 
 // GetLabelByID returns a label by given ID.
 func GetLabelByID(id int64) (*Label, error) {
-	return getLabelByID(x, id)
+	return getLabelInRepoByID(x, 0, id)
+}
+
+// GetLabelInRepoByID returns a label by ID in given repository.
+func GetLabelInRepoByID(repoID, labelID int64) (*Label, error) {
+	return getLabelInRepoByID(x, repoID, labelID)
+}
+
+// GetLabelsInRepoByIDs returns a list of labels by IDs in given repository,
+// it silently ignores label IDs that are not belong to the repository.
+func GetLabelsInRepoByIDs(repoID int64, labelIDs []int64) ([]*Label, error) {
+	labels := make([]*Label, 0, len(labelIDs))
+	return labels, x.Where("repo_id = ?", repoID).In("id", base.Int64sToStrings(labelIDs)).Find(&labels)
 }
 
 // GetLabelsByRepoID returns all labels that belong to given repository by ID.
 func GetLabelsByRepoID(repoID int64) ([]*Label, error) {
 	labels := make([]*Label, 0, 10)
-	return labels, x.Where("repo_id=?", repoID).Find(&labels)
+	return labels, x.Where("repo_id = ?", repoID).Find(&labels)
 }
 
 func getLabelsByIssueID(e Engine, issueID int64) ([]*Label, error) {
 	issueLabels, err := getIssueLabels(e, issueID)
 	if err != nil {
 		return nil, fmt.Errorf("getIssueLabels: %v", err)
+	} else if len(issueLabels) == 0 {
+		return []*Label{}, nil
 	}
 
-	var label *Label
-	labels := make([]*Label, 0, len(issueLabels))
-	for idx := range issueLabels {
-		label, err = getLabelByID(e, issueLabels[idx].LabelID)
-		if err != nil && !IsErrLabelNotExist(err) {
-			return nil, fmt.Errorf("getLabelByID: %v", err)
-		}
-		labels = append(labels, label)
+	labelIDs := make([]int64, len(issueLabels))
+	for i := range issueLabels {
+		labelIDs[i] = issueLabels[i].LabelID
 	}
-	return labels, nil
+
+	labels := make([]*Label, 0, len(labelIDs))
+	return labels, e.Where("id > 0").In("id", base.Int64sToStrings(labelIDs)).Find(&labels)
 }
 
 // GetLabelsByIssueID returns all labels that belong to given issue by ID.
@@ -117,7 +136,7 @@ func UpdateLabel(l *Label) error {
 
 // DeleteLabel delete a label of given repository.
 func DeleteLabel(repoID, labelID int64) error {
-	l, err := GetLabelByID(labelID)
+	_, err := GetLabelInRepoByID(repoID, labelID)
 	if err != nil {
 		if IsErrLabelNotExist(err) {
 			return nil
@@ -131,11 +150,12 @@ func DeleteLabel(repoID, labelID int64) error {
 		return err
 	}
 
-	if _, err = x.Where("label_id=?", labelID).Delete(new(IssueLabel)); err != nil {
+	if _, err = sess.Id(labelID).Delete(new(Label)); err != nil {
 		return err
-	} else if _, err = sess.Delete(l); err != nil {
+	} else if _, err = sess.Where("label_id = ?", labelID).Delete(new(IssueLabel)); err != nil {
 		return err
 	}
+
 	return sess.Commit()
 }
 
@@ -154,7 +174,7 @@ type IssueLabel struct {
 }
 
 func hasIssueLabel(e Engine, issueID, labelID int64) bool {
-	has, _ := e.Where("issue_id=? AND label_id=?", issueID, labelID).Get(new(IssueLabel))
+	has, _ := e.Where("issue_id = ? AND label_id = ?", issueID, labelID).Get(new(IssueLabel))
 	return has
 }
 
@@ -180,6 +200,10 @@ func newIssueLabel(e *xorm.Session, issue *Issue, label *Label) (err error) {
 
 // NewIssueLabel creates a new issue-label relation.
 func NewIssueLabel(issue *Issue, label *Label) (err error) {
+	if HasIssueLabel(issue.ID, label.ID) {
+		return nil
+	}
+
 	sess := x.NewSession()
 	defer sessionRelease(sess)
 	if err = sess.Begin(); err != nil {
@@ -193,6 +217,35 @@ func NewIssueLabel(issue *Issue, label *Label) (err error) {
 	return sess.Commit()
 }
 
+func newIssueLabels(e *xorm.Session, issue *Issue, labels []*Label) (err error) {
+	for i := range labels {
+		if hasIssueLabel(e, issue.ID, labels[i].ID) {
+			continue
+		}
+
+		if err = newIssueLabel(e, issue, labels[i]); err != nil {
+			return fmt.Errorf("newIssueLabel: %v", err)
+		}
+	}
+
+	return nil
+}
+
+// NewIssueLabels creates a list of issue-label relations.
+func NewIssueLabels(issue *Issue, labels []*Label) (err error) {
+	sess := x.NewSession()
+	defer sessionRelease(sess)
+	if err = sess.Begin(); err != nil {
+		return err
+	}
+
+	if err = newIssueLabels(sess, issue, labels); err != nil {
+		return err
+	}
+
+	return sess.Commit()
+}
+
 func getIssueLabels(e Engine, issueID int64) ([]*IssueLabel, error) {
 	issueLabels := make([]*IssueLabel, 0, 10)
 	return issueLabels, e.Where("issue_id=?", issueID).Asc("label_id").Find(&issueLabels)

routers/api/v1/api.go

@@ -244,7 +244,7 @@ func RegisterRoutes(m *macaron.Macaron) {
 					m.Group("/:index", func() {
 						m.Combo("").Get(repo.GetIssue).Patch(bind(api.EditIssueOption{}), repo.EditIssue)
 						m.Group("/labels", func() {
-							m.Combo("").Get(repo.GetIssueLabels).
+							m.Combo("").Get(repo.ListIssueLabels).
 								Post(bind(api.IssueLabelsOption{}), repo.AddIssueLabels).
 								Put(bind(api.IssueLabelsOption{}), repo.ReplaceIssueLabels).
 								Delete(repo.ClearIssueLabels)
@@ -255,8 +255,8 @@ func RegisterRoutes(m *macaron.Macaron) {
 				})
 				m.Group("/labels", func() {
 					m.Combo("").Get(repo.ListLabels).
-						Post(bind(api.LabelOption{}), repo.CreateLabel)
-					m.Combo("/:id").Get(repo.GetLabel).Patch(bind(api.LabelOption{}), repo.EditLabel).
+						Post(bind(api.CreateLabelOption{}), repo.CreateLabel)
+					m.Combo("/:id").Get(repo.GetLabel).Patch(bind(api.EditLabelOption{}), repo.EditLabel).
 						Delete(repo.DeleteLabel)
 				})
 			}, RepoAssignment())

routers/api/v1/repo/issue_label.go

@@ -12,7 +12,7 @@ import (
 	"github.com/gogits/gogs/routers/api/v1/convert"
 )
 
-func GetIssueLabels(ctx *context.APIContext) {
+func ListIssueLabels(ctx *context.APIContext) {
 	issue, err := models.GetIssueByIndex(ctx.Repo.Repository.ID, ctx.ParamsInt64(":index"))
 	if err != nil {
 		if models.IsErrIssueNotExist(err) {
@@ -27,7 +27,6 @@ func GetIssueLabels(ctx *context.APIContext) {
 	for i := range issue.Labels {
 		apiLabels[i] = convert.ToLabel(issue.Labels[i])
 	}
-
 	ctx.JSON(200, &apiLabels)
 }
 
@@ -47,41 +46,31 @@ func AddIssueLabels(ctx *context.APIContext, form api.IssueLabelsOption) {
 		return
 	}
 
-	var labels []*models.Label
-	if labels, err = filterLabelsByRepoID(form.Labels, issue.RepoID); err != nil {
-		ctx.Error(400, "filterLabelsByRepoID", err)
+	labels, err := models.GetLabelsInRepoByIDs(ctx.Repo.Repository.ID, form.Labels)
+	if err != nil {
+		ctx.Error(500, "GetLabelsInRepoByIDs", err)
 		return
 	}
 
-	for i := range labels {
-		if !models.HasIssueLabel(issue.ID, labels[i].ID) {
-			if err := models.NewIssueLabel(issue, labels[i]); err != nil {
-				ctx.Error(500, "NewIssueLabel", err)
-				return
-			}
-		}
+	if err = issue.AddLabels(labels); err != nil {
+		ctx.Error(500, "AddLabels", err)
+		return
 	}
 
-	// Refresh issue to get the updated list of labels from the DB
-	issue, err = models.GetIssueByIndex(ctx.Repo.Repository.ID, ctx.ParamsInt64(":index"))
+	labels, err = models.GetLabelsByIssueID(issue.ID)
 	if err != nil {
-		if models.IsErrIssueNotExist(err) {
-			ctx.Status(404)
-		} else {
-			ctx.Error(500, "GetIssueByIndex", err)
-		}
+		ctx.Error(500, "GetLabelsByIssueID", err)
 		return
 	}
 
-	apiLabels := make([]*api.Label, len(issue.Labels))
-	for i := range issue.Labels {
-		apiLabels[i] = convert.ToLabel(issue.Labels[i])
+	apiLabels := make([]*api.Label, len(labels))
+	for i := range labels {
+		apiLabels[i] = convert.ToLabel(labels[i])
 	}
-
 	ctx.JSON(200, &apiLabels)
 }
 
-func ReplaceIssueLabels(ctx *context.APIContext, form api.IssueLabelsOption) {
+func DeleteIssueLabel(ctx *context.APIContext) {
 	if !ctx.Repo.IsWriter() {
 		ctx.Status(403)
 		return
@@ -97,44 +86,25 @@ func ReplaceIssueLabels(ctx *context.APIContext, form api.IssueLabelsOption) {
 		return
 	}
 
-	var labels []*models.Label
-	if labels, err = filterLabelsByRepoID(form.Labels, issue.RepoID); err != nil {
-		ctx.Error(400, "filterLabelsByRepoID", err)
-		return
-	}
-
-	if err := issue.ClearLabels(); err != nil {
-		ctx.Error(500, "ClearLabels", err)
-		return
-	}
-
-	for i := range labels {
-		if err := models.NewIssueLabel(issue, labels[i]); err != nil {
-			ctx.Error(500, "NewIssueLabel", err)
-			return
-		}
-	}
-
-	// Refresh issue to get the updated list of labels from the DB
-	issue, err = models.GetIssueByIndex(ctx.Repo.Repository.ID, ctx.ParamsInt64(":index"))
+	label, err := models.GetLabelInRepoByID(ctx.Repo.Repository.ID, ctx.ParamsInt64(":id"))
 	if err != nil {
-		if models.IsErrIssueNotExist(err) {
-			ctx.Status(404)
+		if models.IsErrLabelNotExist(err) {
+			ctx.Error(422, "", err)
 		} else {
-			ctx.Error(500, "GetIssueByIndex", err)
+			ctx.Error(500, "GetLabelInRepoByID", err)
 		}
 		return
 	}
 
-	apiLabels := make([]*api.Label, len(issue.Labels))
-	for i := range issue.Labels {
-		apiLabels[i] = convert.ToLabel(issue.Labels[i])
+	if err := models.DeleteIssueLabel(issue, label); err != nil {
+		ctx.Error(500, "DeleteIssueLabel", err)
+		return
 	}
 
-	ctx.JSON(200, &apiLabels)
+	ctx.Status(204)
 }
 
-func DeleteIssueLabel(ctx *context.APIContext) {
+func ReplaceIssueLabels(ctx *context.APIContext, form api.IssueLabelsOption) {
 	if !ctx.Repo.IsWriter() {
 		ctx.Status(403)
 		return
@@ -150,22 +120,28 @@ func DeleteIssueLabel(ctx *context.APIContext) {
 		return
 	}
 
-	label, err := models.GetLabelByID(ctx.ParamsInt64(":id"))
+	labels, err := models.GetLabelsInRepoByIDs(ctx.Repo.Repository.ID, form.Labels)
 	if err != nil {
-		if models.IsErrLabelNotExist(err) {
-			ctx.Status(400)
-		} else {
-			ctx.Error(500, "GetLabelByID", err)
-		}
+		ctx.Error(500, "GetLabelsInRepoByIDs", err)
 		return
 	}
 
-	if err := models.DeleteIssueLabel(issue, label); err != nil {
-		ctx.Error(500, "DeleteIssueLabel", err)
+	if err := issue.ReplaceLabels(labels); err != nil {
+		ctx.Error(500, "ReplaceLabels", err)
 		return
 	}
 
-	ctx.Status(204)
+	labels, err = models.GetLabelsByIssueID(issue.ID)
+	if err != nil {
+		ctx.Error(500, "GetLabelsByIssueID", err)
+		return
+	}
+
+	apiLabels := make([]*api.Label, len(labels))
+	for i := range labels {
+		apiLabels[i] = convert.ToLabel(labels[i])
+	}
+	ctx.JSON(200, &apiLabels)
 }
 
 func ClearIssueLabels(ctx *context.APIContext) {
@@ -191,29 +167,3 @@ func ClearIssueLabels(ctx *context.APIContext) {
 
 	ctx.Status(204)
 }
-
-func filterLabelsByRepoID(labelIDs []int64, repoID int64) ([]*models.Label, error) {
-	labels := make([]*models.Label, 0, len(labelIDs))
-	errors := make([]error, 0, len(labelIDs))
-
-	for i := range labelIDs {
-		label, err := models.GetLabelByID(labelIDs[i])
-		if err != nil {
-			errors = append(errors, err)
-		} else if label.RepoID != repoID {
-			errors = append(errors, models.ErrLabelNotValidForRepository{label.ID, repoID})
-		} else {
-			labels = append(labels, label)
-		}
-	}
-
-	errorCount := len(errors)
-
-	if errorCount == 1 {
-		return labels, errors[0]
-	} else if errorCount > 1 {
-		return labels, models.ErrMultipleErrors{errors}
-	}
-
-	return labels, nil
-}

routers/api/v1/repo/label.go

@@ -9,14 +9,13 @@ import (
 
 	"github.com/gogits/gogs/models"
 	"github.com/gogits/gogs/modules/context"
-	"github.com/gogits/gogs/modules/log"
 	"github.com/gogits/gogs/routers/api/v1/convert"
 )
 
 func ListLabels(ctx *context.APIContext) {
 	labels, err := models.GetLabelsByRepoID(ctx.Repo.Repository.ID)
 	if err != nil {
-		ctx.Error(500, "Labels", err)
+		ctx.Error(500, "GetLabelsByRepoID", err)
 		return
 	}
 
@@ -24,17 +23,16 @@ func ListLabels(ctx *context.APIContext) {
 	for i := range labels {
 		apiLabels[i] = convert.ToLabel(labels[i])
 	}
-
 	ctx.JSON(200, &apiLabels)
 }
 
 func GetLabel(ctx *context.APIContext) {
-	label, err := models.GetLabelByID(ctx.ParamsInt64(":id"))
+	label, err := models.GetLabelInRepoByID(ctx.Repo.Repository.ID, ctx.ParamsInt64(":id"))
 	if err != nil {
 		if models.IsErrLabelNotExist(err) {
 			ctx.Status(404)
 		} else {
-			ctx.Error(500, "GetLabelByID", err)
+			ctx.Error(500, "GetLabelByRepoID", err)
 		}
 		return
 	}
@@ -42,7 +40,7 @@ func GetLabel(ctx *context.APIContext) {
 	ctx.JSON(200, convert.ToLabel(label))
 }
 
-func CreateLabel(ctx *context.APIContext, form api.LabelOption) {
+func CreateLabel(ctx *context.APIContext, form api.CreateLabelOption) {
 	if !ctx.Repo.IsWriter() {
 		ctx.Status(403)
 		return
@@ -53,43 +51,35 @@ func CreateLabel(ctx *context.APIContext, form api.LabelOption) {
 		Color:  form.Color,
 		RepoID: ctx.Repo.Repository.ID,
 	}
-	err := models.NewLabel(label)
-	if err != nil {
+	if err := models.NewLabel(label); err != nil {
 		ctx.Error(500, "NewLabel", err)
 		return
 	}
-
-	label, err = models.GetLabelByID(label.ID)
-	if err != nil {
-		ctx.Error(500, "GetLabelByID", err)
-		return
-	}
 	ctx.JSON(201, convert.ToLabel(label))
 }
 
-func EditLabel(ctx *context.APIContext, form api.LabelOption) {
+func EditLabel(ctx *context.APIContext, form api.EditLabelOption) {
 	if !ctx.Repo.IsWriter() {
 		ctx.Status(403)
 		return
 	}
 
-	label, err := models.GetLabelByID(ctx.ParamsInt64(":id"))
+	label, err := models.GetLabelInRepoByID(ctx.Repo.Repository.ID, ctx.ParamsInt64(":id"))
 	if err != nil {
 		if models.IsErrLabelNotExist(err) {
 			ctx.Status(404)
 		} else {
-			ctx.Error(500, "GetLabelByID", err)
+			ctx.Error(500, "GetLabelByRepoID", err)
 		}
 		return
 	}
 
-	if len(form.Name) > 0 {
-		label.Name = form.Name
+	if form.Name != nil {
+		label.Name = *form.Name
 	}
-	if len(form.Color) > 0 {
-		label.Color = form.Color
+	if form.Color != nil {
+		label.Color = *form.Color
 	}
-
 	if err := models.UpdateLabel(label); err != nil {
 		ctx.Handle(500, "UpdateLabel", err)
 		return
@@ -103,21 +93,10 @@ func DeleteLabel(ctx *context.APIContext) {
 		return
 	}
 
-	label, err := models.GetLabelByID(ctx.ParamsInt64(":id"))
-	if err != nil {
-		if models.IsErrLabelNotExist(err) {
-			ctx.Status(404)
-		} else {
-			ctx.Error(500, "GetLabelByID", err)
-		}
-		return
-	}
-
 	if err := models.DeleteLabel(ctx.Repo.Repository.ID, ctx.ParamsInt64(":id")); err != nil {
 		ctx.Error(500, "DeleteLabel", err)
 		return
 	}
 
-	log.Trace("Label deleted: %s %s", label.ID, label.Name)
 	ctx.Status(204)
 }

templates/.VERSION

@@ -1 +1 @@
-0.9.59.0730
+0.9.60.0803