diff options
Diffstat (limited to 'models')
| -rw-r--r-- | models/issue.go | 4 | ||||
| -rw-r--r-- | models/issue_label.go | 14 | ||||
| -rw-r--r-- | models/release.go | 4 | ||||
| -rw-r--r-- | models/token.go | 4 | ||||
| -rw-r--r-- | models/webhook.go | 8 |
5 files changed, 17 insertions, 17 deletions
diff --git a/models/issue.go b/models/issue.go index bd9addf1..161ff188 100644 --- 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 index 13bf2005..bdda3432 100644 --- 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 index bac0e0f3..f470f54d 100644 --- 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 index 85600dab..d47545ae 100644 --- 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 index 52d9bbbd..8ce924df 100644 --- 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, |