Some code renaming

unknwon · unknwon · commit 03f7f3ee67f9 · 2016-12-22T19:58:30.000-05:00
diff --git a/models/issue.go b/models/issue.go
@@ -1612,8 +1612,8 @@ func ChangeMilestoneAssign(issue *Issue, oldMilestoneID int64) (err error) {
 	return sess.Commit()
 }
 
-// DeleteMilestoneByRepoID deletes a milestone from a repository.
-func DeleteMilestoneByRepoID(repoID, id int64) error {
+// DeleteMilestoneOfRepoByID deletes a milestone from a repository.
+func DeleteMilestoneOfRepoByID(repoID, id int64) error {
 	m, err := GetMilestoneByRepoID(repoID, id)
 	if err != nil {
 		if IsErrMilestoneNotExist(err) {
diff --git a/models/issue_label.go b/models/issue_label.go
@@ -103,10 +103,10 @@ func NewLabels(labels ...*Label) error {
 	return err
 }
 
-// getLabelInRepoByID returns a label by ID in given repository.
+// getLabelOfRepoByID 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) {
+func getLabelOfRepoByID(e Engine, repoID, labelID int64) (*Label, error) {
 	if labelID <= 0 {
 		return nil, ErrLabelNotExist{labelID, repoID}
 	}
@@ -126,12 +126,12 @@ func getLabelInRepoByID(e Engine, repoID, labelID int64) (*Label, error) {
 
 // GetLabelByID returns a label by given ID.
 func GetLabelByID(id int64) (*Label, error) {
-	return getLabelInRepoByID(x, 0, id)
+	return getLabelOfRepoByID(x, 0, id)
 }
 
-// GetLabelInRepoByID returns a label by ID in given repository.
-func GetLabelInRepoByID(repoID, labelID int64) (*Label, error) {
-	return getLabelInRepoByID(x, repoID, labelID)
+// GetLabelOfRepoByID returns a label by ID in given repository.
+func GetLabelOfRepoByID(repoID, labelID int64) (*Label, error) {
+	return getLabelOfRepoByID(x, repoID, labelID)
 }
 
 // GetLabelsInRepoByIDs returns a list of labels by IDs in given repository,
@@ -181,7 +181,7 @@ func UpdateLabel(l *Label) error {
 
 // DeleteLabel delete a label of given repository.
 func DeleteLabel(repoID, labelID int64) error {
-	_, err := GetLabelInRepoByID(repoID, labelID)
+	_, err := GetLabelOfRepoByID(repoID, labelID)
 	if err != nil {
 		if IsErrLabelNotExist(err) {
 			return nil
diff --git a/models/release.go b/models/release.go
@@ -178,8 +178,8 @@ func UpdateRelease(gitRepo *git.Repository, rel *Release) (err error) {
 	return err
 }
 
-// DeleteReleaseByRepoID deletes a release and corresponding Git tag by given ID.
-func DeleteReleaseByRepoID(repoID, id int64) error {
+// DeleteReleaseOfRepoByID deletes a release and corresponding Git tag by given ID.
+func DeleteReleaseOfRepoByID(repoID, id int64) error {
 	rel, err := GetReleaseByID(id)
 	if err != nil {
 		return fmt.Errorf("GetReleaseByID: %v", err)
diff --git a/models/token.go b/models/token.go
@@ -81,8 +81,8 @@ func UpdateAccessToken(t *AccessToken) error {
 	return err
 }
 
-// DeleteAccessTokenByUserID deletes access token by given ID.
-func DeleteAccessTokenByUserID(userID, id int64) error {
+// DeleteAccessTokenOfUserByID deletes access token by given ID.
+func DeleteAccessTokenOfUserByID(userID, id int64) error {
 	_, err := x.Delete(&AccessToken{
 		ID:  id,
 		UID: userID,
diff --git a/models/webhook.go b/models/webhook.go
@@ -252,16 +252,16 @@ func deleteWebhook(bean *Webhook) (err error) {
 	return sess.Commit()
 }
 
-// DeleteWebhookByRepoID deletes webhook of repository by given ID.
-func DeleteWebhookByRepoID(repoID, id int64) error {
+// DeleteWebhookOfRepoByID deletes webhook of repository by given ID.
+func DeleteWebhookOfRepoByID(repoID, id int64) error {
 	return deleteWebhook(&Webhook{
 		ID:     id,
 		RepoID: repoID,
 	})
 }
 
-// DeleteWebhookByOrgID deletes webhook of organization by given ID.
-func DeleteWebhookByOrgID(orgID, id int64) error {
+// DeleteWebhookOfOrgByID deletes webhook of organization by given ID.
+func DeleteWebhookOfOrgByID(orgID, id int64) error {
 	return deleteWebhook(&Webhook{
 		ID:    id,
 		OrgID: orgID,
diff --git a/routers/api/v1/repo/hook.go b/routers/api/v1/repo/hook.go
@@ -166,7 +166,7 @@ func EditHook(ctx *context.APIContext, form api.EditHookOption) {
 }
 
 func DeleteHook(ctx *context.APIContext) {
-	if err := models.DeleteWebhookByRepoID(ctx.Repo.Repository.ID, ctx.ParamsInt64(":id")); err != nil {
+	if err := models.DeleteWebhookOfRepoByID(ctx.Repo.Repository.ID, ctx.ParamsInt64(":id")); err != nil {
 		ctx.Error(500, "DeleteWebhookByRepoID", err)
 		return
 	}
diff --git a/routers/api/v1/repo/issue_label.go b/routers/api/v1/repo/issue_label.go
@@ -85,7 +85,7 @@ func DeleteIssueLabel(ctx *context.APIContext) {
 		return
 	}
 
-	label, err := models.GetLabelInRepoByID(ctx.Repo.Repository.ID, ctx.ParamsInt64(":id"))
+	label, err := models.GetLabelOfRepoByID(ctx.Repo.Repository.ID, ctx.ParamsInt64(":id"))
 	if err != nil {
 		if models.IsErrLabelNotExist(err) {
 			ctx.Error(422, "", err)
diff --git a/routers/api/v1/repo/label.go b/routers/api/v1/repo/label.go
@@ -26,7 +26,7 @@ func ListLabels(ctx *context.APIContext) {
 }
 
 func GetLabel(ctx *context.APIContext) {
-	label, err := models.GetLabelInRepoByID(ctx.Repo.Repository.ID, ctx.ParamsInt64(":id"))
+	label, err := models.GetLabelOfRepoByID(ctx.Repo.Repository.ID, ctx.ParamsInt64(":id"))
 	if err != nil {
 		if models.IsErrLabelNotExist(err) {
 			ctx.Status(404)
@@ -63,7 +63,7 @@ func EditLabel(ctx *context.APIContext, form api.EditLabelOption) {
 		return
 	}
 
-	label, err := models.GetLabelInRepoByID(ctx.Repo.Repository.ID, ctx.ParamsInt64(":id"))
+	label, err := models.GetLabelOfRepoByID(ctx.Repo.Repository.ID, ctx.ParamsInt64(":id"))
 	if err != nil {
 		if models.IsErrLabelNotExist(err) {
 			ctx.Status(404)
diff --git a/routers/api/v1/repo/milestone.go b/routers/api/v1/repo/milestone.go
@@ -89,7 +89,7 @@ func EditMilestone(ctx *context.APIContext, form api.EditMilestoneOption) {
 }
 
 func DeleteMilestone(ctx *context.APIContext) {
-	if err := models.DeleteMilestoneByRepoID(ctx.Repo.Repository.ID, ctx.ParamsInt64(":id")); err != nil {
+	if err := models.DeleteMilestoneOfRepoByID(ctx.Repo.Repository.ID, ctx.ParamsInt64(":id")); err != nil {
 		ctx.Error(500, "DeleteMilestoneByRepoID", err)
 		return
 	}
diff --git a/routers/org/setting.go b/routers/org/setting.go
@@ -151,7 +151,7 @@ func Webhooks(ctx *context.Context) {
 }
 
 func DeleteWebhook(ctx *context.Context) {
-	if err := models.DeleteWebhookByOrgID(ctx.Org.Organization.ID, ctx.QueryInt64("id")); err != nil {
+	if err := models.DeleteWebhookOfOrgByID(ctx.Org.Organization.ID, ctx.QueryInt64("id")); err != nil {
 		ctx.Flash.Error("DeleteWebhookByOrgID: " + err.Error())
 	} else {
 		ctx.Flash.Success(ctx.Tr("repo.settings.webhook_deletion_success"))
diff --git a/routers/repo/issue.go b/routers/repo/issue.go
@@ -721,7 +721,7 @@ func UpdateIssueLabel(ctx *context.Context) {
 		}
 	} else {
 		isAttach := ctx.Query("action") == "attach"
-		label, err := models.GetLabelInRepoByID(ctx.Repo.Repository.ID, ctx.QueryInt64("id"))
+		label, err := models.GetLabelOfRepoByID(ctx.Repo.Repository.ID, ctx.QueryInt64("id"))
 		if err != nil {
 			if models.IsErrLabelNotExist(err) {
 				ctx.Error(404, "GetLabelByID")
@@ -1223,7 +1223,7 @@ func ChangeMilestonStatus(ctx *context.Context) {
 }
 
 func DeleteMilestone(ctx *context.Context) {
-	if err := models.DeleteMilestoneByRepoID(ctx.Repo.Repository.ID, ctx.QueryInt64("id")); err != nil {
+	if err := models.DeleteMilestoneOfRepoByID(ctx.Repo.Repository.ID, ctx.QueryInt64("id")); err != nil {
 		ctx.Flash.Error("DeleteMilestoneByRepoID: " + err.Error())
 	} else {
 		ctx.Flash.Success(ctx.Tr("repo.milestones.deletion_success"))
diff --git a/routers/repo/release.go b/routers/repo/release.go
@@ -282,7 +282,7 @@ func EditReleasePost(ctx *context.Context, form auth.EditReleaseForm) {
 }
 
 func DeleteRelease(ctx *context.Context) {
-	if err := models.DeleteReleaseByRepoID(ctx.Repo.Repository.ID, ctx.QueryInt64("id")); err != nil {
+	if err := models.DeleteReleaseOfRepoByID(ctx.Repo.Repository.ID, ctx.QueryInt64("id")); err != nil {
 		ctx.Flash.Error("DeleteReleaseByID: " + err.Error())
 	} else {
 		ctx.Flash.Success(ctx.Tr("repo.release.deletion_success"))
diff --git a/routers/repo/webhook.go b/routers/repo/webhook.go
@@ -394,7 +394,7 @@ func TestWebhook(ctx *context.Context) {
 }
 
 func DeleteWebhook(ctx *context.Context) {
-	if err := models.DeleteWebhookByRepoID(ctx.Repo.Repository.ID, ctx.QueryInt64("id")); err != nil {
+	if err := models.DeleteWebhookOfRepoByID(ctx.Repo.Repository.ID, ctx.QueryInt64("id")); err != nil {
 		ctx.Flash.Error("DeleteWebhookByRepoID: " + err.Error())
 	} else {
 		ctx.Flash.Success(ctx.Tr("repo.settings.webhook_deletion_success"))
diff --git a/routers/user/setting.go b/routers/user/setting.go
@@ -412,7 +412,7 @@ func SettingsApplicationsPost(ctx *context.Context, form auth.NewAccessTokenForm
 }
 
 func SettingsDeleteApplication(ctx *context.Context) {
-	if err := models.DeleteAccessTokenByUserID(ctx.User.ID, ctx.QueryInt64("id")); err != nil {
+	if err := models.DeleteAccessTokenOfUserByID(ctx.User.ID, ctx.QueryInt64("id")); err != nil {
 		ctx.Flash.Error("DeleteAccessTokenByID: " + err.Error())
 	} else {
 		ctx.Flash.Success(ctx.Tr("settings.delete_token_success"))

Original file line number	Diff line number	Diff line change
`@@ -166,7 +166,7 @@ func EditHook(ctx *context.APIContext, form api.EditHookOption) {`
`166`	`166`	`}`
`167`	`167`
`168`	`168`	`func DeleteHook(ctx *context.APIContext) {`
`169`		`- if err := models.DeleteWebhookByRepoID(ctx.Repo.Repository.ID, ctx.ParamsInt64(":id")); err != nil {`
	`169`	`+ if err := models.DeleteWebhookOfRepoByID(ctx.Repo.Repository.ID, ctx.ParamsInt64(":id")); err != nil {`
`170`	`170`	`ctx.Error(500, "DeleteWebhookByRepoID", err)`
`171`	`171`	`return`
`172`	`172`	`}`
Original file line number	Diff line number	Diff line change
`@@ -85,7 +85,7 @@ func DeleteIssueLabel(ctx *context.APIContext) {`
`85`	`85`	`return`
`86`	`86`	`}`
`87`	`87`
`88`		`- label, err := models.GetLabelInRepoByID(ctx.Repo.Repository.ID, ctx.ParamsInt64(":id"))`
	`88`	`+ label, err := models.GetLabelOfRepoByID(ctx.Repo.Repository.ID, ctx.ParamsInt64(":id"))`
`89`	`89`	`if err != nil {`
`90`	`90`	`if models.IsErrLabelNotExist(err) {`
`91`	`91`	`ctx.Error(422, "", err)`
Original file line number	Diff line number	Diff line change
`@@ -89,7 +89,7 @@ func EditMilestone(ctx *context.APIContext, form api.EditMilestoneOption) {`
`89`	`89`	`}`
`90`	`90`
`91`	`91`	`func DeleteMilestone(ctx *context.APIContext) {`
`92`		`- if err := models.DeleteMilestoneByRepoID(ctx.Repo.Repository.ID, ctx.ParamsInt64(":id")); err != nil {`
	`92`	`+ if err := models.DeleteMilestoneOfRepoByID(ctx.Repo.Repository.ID, ctx.ParamsInt64(":id")); err != nil {`
`93`	`93`	`ctx.Error(500, "DeleteMilestoneByRepoID", err)`
`94`	`94`	`return`
`95`	`95`	`}`
Original file line number	Diff line number	Diff line change
`@@ -151,7 +151,7 @@ func Webhooks(ctx *context.Context) {`
`151`	`151`	`}`
`152`	`152`
`153`	`153`	`func DeleteWebhook(ctx *context.Context) {`
`154`		`- if err := models.DeleteWebhookByOrgID(ctx.Org.Organization.ID, ctx.QueryInt64("id")); err != nil {`
	`154`	`+ if err := models.DeleteWebhookOfOrgByID(ctx.Org.Organization.ID, ctx.QueryInt64("id")); err != nil {`
`155`	`155`	`ctx.Flash.Error("DeleteWebhookByOrgID: " + err.Error())`
`156`	`156`	`} else {`
`157`	`157`	`ctx.Flash.Success(ctx.Tr("repo.settings.webhook_deletion_success"))`
Original file line number	Diff line number	Diff line change
`@@ -282,7 +282,7 @@ func EditReleasePost(ctx *context.Context, form auth.EditReleaseForm) {`
`282`	`282`	`}`
`283`	`283`
`284`	`284`	`func DeleteRelease(ctx *context.Context) {`
`285`		`- if err := models.DeleteReleaseByRepoID(ctx.Repo.Repository.ID, ctx.QueryInt64("id")); err != nil {`
	`285`	`+ if err := models.DeleteReleaseOfRepoByID(ctx.Repo.Repository.ID, ctx.QueryInt64("id")); err != nil {`
`286`	`286`	`ctx.Flash.Error("DeleteReleaseByID: " + err.Error())`
`287`	`287`	`} else {`
`288`	`288`	`ctx.Flash.Success(ctx.Tr("repo.release.deletion_success"))`
Original file line number	Diff line number	Diff line change
`@@ -394,7 +394,7 @@ func TestWebhook(ctx *context.Context) {`
`394`	`394`	`}`
`395`	`395`
`396`	`396`	`func DeleteWebhook(ctx *context.Context) {`
`397`		`- if err := models.DeleteWebhookByRepoID(ctx.Repo.Repository.ID, ctx.QueryInt64("id")); err != nil {`
	`397`	`+ if err := models.DeleteWebhookOfRepoByID(ctx.Repo.Repository.ID, ctx.QueryInt64("id")); err != nil {`
`398`	`398`	`ctx.Flash.Error("DeleteWebhookByRepoID: " + err.Error())`
`399`	`399`	`} else {`
`400`	`400`	`ctx.Flash.Success(ctx.Tr("repo.settings.webhook_deletion_success"))`
Original file line number	Diff line number	Diff line change
`@@ -412,7 +412,7 @@ func SettingsApplicationsPost(ctx *context.Context, form auth.NewAccessTokenForm`
`412`	`412`	`}`
`413`	`413`
`414`	`414`	`func SettingsDeleteApplication(ctx *context.Context) {`
`415`		`- if err := models.DeleteAccessTokenByUserID(ctx.User.ID, ctx.QueryInt64("id")); err != nil {`
	`415`	`+ if err := models.DeleteAccessTokenOfUserByID(ctx.User.ID, ctx.QueryInt64("id")); err != nil {`
`416`	`416`	`ctx.Flash.Error("DeleteAccessTokenByID: " + err.Error())`
`417`	`417`	`} else {`
`418`	`418`	`ctx.Flash.Success(ctx.Tr("settings.delete_token_success"))`