USEFULL
/
gogs
mirror of https://github.com/gogs/gogs.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Some code renaming

pull/3244/merge
Unknwon 2016-12-22 19:58:30 -05:00
parent 6383bf7480
commit 03f7f3ee67
No known key found for this signature in database
GPG Key ID: FB9F411CDD69BEC1
14 changed files with 28 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
models/issue.go
View File

@ -1612,8 +1612,8 @@ func ChangeMilestoneAssign(issue *Issue, oldMilestoneID int64) (err error) {
return sess.Commit() return sess.Commit()
} }
// DeleteMilestoneByRepoID deletes a milestone from a repository. // DeleteMilestoneOfRepoByID deletes a milestone from a repository.
func DeleteMilestoneByRepoID(repoID, id int64) error { func DeleteMilestoneOfRepoByID(repoID, id int64) error {
m, err := GetMilestoneByRepoID(repoID, id) m, err := GetMilestoneByRepoID(repoID, id)
if err != nil { if err != nil {
if IsErrMilestoneNotExist(err) { if IsErrMilestoneNotExist(err) {

14
models/issue_label.go
View File

@ -103,10 +103,10 @@ func NewLabels(labels ...*Label) error {
return err 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 // If pass repoID as 0, then ORM will ignore limitation of repository
// and can return arbitrary label with any valid ID. // 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 { if labelID <= 0 {
return nil, ErrLabelNotExist{labelID, repoID} 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. // GetLabelByID returns a label by given ID.
func GetLabelByID(id int64) (*Label, error) { 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. // GetLabelOfRepoByID returns a label by ID in given repository.
func GetLabelInRepoByID(repoID, labelID int64) (*Label, error) { func GetLabelOfRepoByID(repoID, labelID int64) (*Label, error) {
return getLabelInRepoByID(x, repoID, labelID) return getLabelOfRepoByID(x, repoID, labelID)
} }
// GetLabelsInRepoByIDs returns a list of labels by IDs in given repository, // 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. // DeleteLabel delete a label of given repository.
func DeleteLabel(repoID, labelID int64) error { func DeleteLabel(repoID, labelID int64) error {
_, err := GetLabelInRepoByID(repoID, labelID) _, err := GetLabelOfRepoByID(repoID, labelID)
if err != nil { if err != nil {
if IsErrLabelNotExist(err) { if IsErrLabelNotExist(err) {
return nil return nil

4
models/release.go
View File

@ -178,8 +178,8 @@ func UpdateRelease(gitRepo *git.Repository, rel *Release) (err error) {
return err return err
} }
// DeleteReleaseByRepoID deletes a release and corresponding Git tag by given ID. // DeleteReleaseOfRepoByID deletes a release and corresponding Git tag by given ID.
func DeleteReleaseByRepoID(repoID, id int64) error { func DeleteReleaseOfRepoByID(repoID, id int64) error {
rel, err := GetReleaseByID(id) rel, err := GetReleaseByID(id)
if err != nil { if err != nil {
return fmt.Errorf("GetReleaseByID: %v", err) return fmt.Errorf("GetReleaseByID: %v", err)

4
models/token.go
View File

@ -81,8 +81,8 @@ func UpdateAccessToken(t *AccessToken) error {
return err return err
} }
// DeleteAccessTokenByUserID deletes access token by given ID. // DeleteAccessTokenOfUserByID deletes access token by given ID.
func DeleteAccessTokenByUserID(userID, id int64) error { func DeleteAccessTokenOfUserByID(userID, id int64) error {
_, err := x.Delete(&AccessToken{ _, err := x.Delete(&AccessToken{
ID: id, ID: id,
UID: userID, UID: userID,

8
models/webhook.go
View File

@ -252,16 +252,16 @@ func deleteWebhook(bean *Webhook) (err error) {
return sess.Commit() return sess.Commit()
} }
// DeleteWebhookByRepoID deletes webhook of repository by given ID. // DeleteWebhookOfRepoByID deletes webhook of repository by given ID.
func DeleteWebhookByRepoID(repoID, id int64) error { func DeleteWebhookOfRepoByID(repoID, id int64) error {
return deleteWebhook(&Webhook{ return deleteWebhook(&Webhook{
ID: id, ID: id,
RepoID: repoID, RepoID: repoID,
}) })
} }
// DeleteWebhookByOrgID deletes webhook of organization by given ID. // DeleteWebhookOfOrgByID deletes webhook of organization by given ID.
func DeleteWebhookByOrgID(orgID, id int64) error { func DeleteWebhookOfOrgByID(orgID, id int64) error {
return deleteWebhook(&Webhook{ return deleteWebhook(&Webhook{
ID: id, ID: id,
OrgID: orgID, OrgID: orgID,

2
routers/api/v1/repo/hook.go
View File

@ -166,7 +166,7 @@ func EditHook(ctx *context.APIContext, form api.EditHookOption) {
} }
func DeleteHook(ctx *context.APIContext) { 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) ctx.Error(500, "DeleteWebhookByRepoID", err)
return return
} }

2
routers/api/v1/repo/issue_label.go
View File

@ -85,7 +85,7 @@ func DeleteIssueLabel(ctx *context.APIContext) {
return 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 err != nil {
if models.IsErrLabelNotExist(err) { if models.IsErrLabelNotExist(err) {
ctx.Error(422, "", err) ctx.Error(422, "", err)

4
routers/api/v1/repo/label.go
View File

@ -26,7 +26,7 @@ func ListLabels(ctx *context.APIContext) {
} }
func GetLabel(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 err != nil {
if models.IsErrLabelNotExist(err) { if models.IsErrLabelNotExist(err) {
ctx.Status(404) ctx.Status(404)
@ -63,7 +63,7 @@ func EditLabel(ctx *context.APIContext, form api.EditLabelOption) {
return 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 err != nil {
if models.IsErrLabelNotExist(err) { if models.IsErrLabelNotExist(err) {
ctx.Status(404) ctx.Status(404)

2
routers/api/v1/repo/milestone.go
View File

@ -89,7 +89,7 @@ func EditMilestone(ctx *context.APIContext, form api.EditMilestoneOption) {
} }
func DeleteMilestone(ctx *context.APIContext) { 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) ctx.Error(500, "DeleteMilestoneByRepoID", err)
return return
} }

2
routers/org/setting.go
View File

@ -151,7 +151,7 @@ func Webhooks(ctx *context.Context) {
} }
func DeleteWebhook(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()) ctx.Flash.Error("DeleteWebhookByOrgID: " + err.Error())
} else { } else {
ctx.Flash.Success(ctx.Tr("repo.settings.webhook_deletion_success")) ctx.Flash.Success(ctx.Tr("repo.settings.webhook_deletion_success"))

4
routers/repo/issue.go
View File

@ -721,7 +721,7 @@ func UpdateIssueLabel(ctx *context.Context) {
} }
} else { } else {
isAttach := ctx.Query("action") == "attach" 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 err != nil {
if models.IsErrLabelNotExist(err) { if models.IsErrLabelNotExist(err) {
ctx.Error(404, "GetLabelByID") ctx.Error(404, "GetLabelByID")
@ -1223,7 +1223,7 @@ func ChangeMilestonStatus(ctx *context.Context) {
} }
func DeleteMilestone(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()) ctx.Flash.Error("DeleteMilestoneByRepoID: " + err.Error())
} else { } else {
ctx.Flash.Success(ctx.Tr("repo.milestones.deletion_success")) ctx.Flash.Success(ctx.Tr("repo.milestones.deletion_success"))

2
routers/repo/release.go
View File

@ -282,7 +282,7 @@ func EditReleasePost(ctx *context.Context, form auth.EditReleaseForm) {
} }
func DeleteRelease(ctx *context.Context) { 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()) ctx.Flash.Error("DeleteReleaseByID: " + err.Error())
} else { } else {
ctx.Flash.Success(ctx.Tr("repo.release.deletion_success")) ctx.Flash.Success(ctx.Tr("repo.release.deletion_success"))

2
routers/repo/webhook.go
View File

@ -394,7 +394,7 @@ func TestWebhook(ctx *context.Context) {
} }
func DeleteWebhook(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()) ctx.Flash.Error("DeleteWebhookByRepoID: " + err.Error())
} else { } else {
ctx.Flash.Success(ctx.Tr("repo.settings.webhook_deletion_success")) ctx.Flash.Success(ctx.Tr("repo.settings.webhook_deletion_success"))

2
routers/user/setting.go
View File

@ -412,7 +412,7 @@ func SettingsApplicationsPost(ctx *context.Context, form auth.NewAccessTokenForm
} }
func SettingsDeleteApplication(ctx *context.Context) { 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()) ctx.Flash.Error("DeleteAccessTokenByID: " + err.Error())
} else { } else {
ctx.Flash.Success(ctx.Tr("settings.delete_token_success")) ctx.Flash.Success(ctx.Tr("settings.delete_token_success"))