tdsds.com/gitea
1
1
Fork 0
mirror of https://github.com/go-gitea/gitea synced 2025-07-23 02:38:35 +00:00
Code Releases Activity

Web editor: improve delete file

Browse Source
This commit is contained in:
Unknwon
2016-08-14 23:38:35 -07:00
parent cd89f6c502
commit 54e0ada9d5
8 changed files with 89 additions and 101 deletions
Download Patch File Download Diff File Expand all files Collapse all files

49
routers/repo/delete.go
View File

@@ -1,49 +0,0 @@
// Copyright 2016 The Gogs Authors. All rights reserved.
// Use of this source code is governed by a MIT-style
// license that can be found in the LICENSE file.
package repo
import (
"github.com/gogits/gogs/models"
"github.com/gogits/gogs/modules/auth"
"github.com/gogits/gogs/modules/context"
"github.com/gogits/gogs/modules/log"
)
func DeleteFilePost(ctx *context.Context, form auth.DeleteRepoFileForm) {
branchName := ctx.Repo.BranchName
treeName := ctx.Repo.TreeName
if ctx.HasError() {
ctx.Redirect(ctx.Repo.RepoLink + "/src/" + branchName + "/" + treeName)
return
}
if err := ctx.Repo.Repository.DeleteRepoFile(ctx.User, branchName, treeName, form.CommitSummary); err != nil {
ctx.Handle(500, "DeleteRepoFile", err)
return
}
// Was successful, so now need to call models.CommitRepoAction() with the new commitID for webhooks and watchers
if branch, err := ctx.Repo.Repository.GetBranch(branchName); err != nil {
log.Error(4, "repo.Repository.GetBranch(%s): %v", branchName, err)
} else if commit, err := branch.GetCommit(); err != nil {
log.Error(4, "branch.GetCommit(): %v", err)
} else {
pc := &models.PushCommits{
Len: 1,
Commits: []*models.PushCommit{models.CommitToPushCommit(commit)},
}
oldCommitID := ctx.Repo.CommitID
newCommitID := commit.ID.String()
if err := models.CommitRepoAction(ctx.User.ID, ctx.Repo.Owner.ID, ctx.User.LowerName, ctx.Repo.Owner.Email,
ctx.Repo.Repository.ID, ctx.Repo.Owner.LowerName, ctx.Repo.Repository.Name, "refs/heads/"+branchName, pc,
oldCommitID, newCommitID); err != nil {
log.Error(4, "models.CommitRepoAction(branch = %s): %v", branchName, err)
}
models.HookQueue.Add(ctx.Repo.Repository.ID)
}
ctx.Redirect(ctx.Repo.RepoLink + "/src/" + branchName)
}

23
routers/repo/edit.go → routers/repo/editor.go
View File

@@ -26,12 +26,6 @@ const (
)
func editFile(ctx *context.Context, isNewFile bool) {
// Don't allow edit a file in a specific commit.
if ctx.Repo.IsViewCommit {
ctx.Handle(404, "", nil)
return
}
ctx.Data["PageIsEdit"] = true
ctx.Data["IsNewFile"] = isNewFile
ctx.Data["RequireHighlightJS"] = true
@@ -327,3 +321,20 @@ func DiffPreviewPost(ctx *context.Context, form auth.EditPreviewDiffForm) {
ctx.HTML(200, DIFF_PREVIEW)
}
func DeleteFilePost(ctx *context.Context, form auth.DeleteRepoFileForm) {
branchName := ctx.Repo.BranchName
treeName := ctx.Repo.TreeName
if ctx.HasError() {
ctx.Redirect(ctx.Repo.RepoLink + "/src/" + branchName + "/" + treeName)
return
}
if err := ctx.Repo.Repository.DeleteRepoFile(ctx.User, ctx.Repo.CommitID, branchName, treeName, form.CommitSummary); err != nil {
ctx.Handle(500, "DeleteRepoFile", err)
return
}
ctx.Redirect(ctx.Repo.RepoLink + "/src/" + branchName)
}

4
routers/repo/view.go
View File

@@ -53,7 +53,6 @@ func Home(ctx *context.Context) {
rawLink := ctx.Repo.RepoLink + "/raw/" + branchName
editLink := ctx.Repo.RepoLink + "/_edit/" + branchName
newFileLink := ctx.Repo.RepoLink + "/_new/" + branchName
deleteLink := ctx.Repo.RepoLink + "/delete/" + branchName
forkLink := setting.AppSubUrl + "/repo/fork/" + strconv.FormatInt(ctx.Repo.Repository.ID, 10)
uploadFileLink := ctx.Repo.RepoLink + "/upload/" + branchName
@@ -171,7 +170,6 @@ func Home(ctx *context.Context) {
}
if ctx.Repo.IsWriter() && ctx.Repo.IsViewBranch {
ctx.Data["FileDeleteLink"] = deleteLink + "/" + treename
ctx.Data["FileDeleteLinkTooltip"] = ctx.Tr("repo.delete_this_file")
} else {
if !ctx.Repo.IsViewBranch {
@@ -259,7 +257,7 @@ func Home(ctx *context.Context) {
ctx.Data["LastCommitUser"] = models.ValidateCommitWithEmail(lastCommit)
if ctx.Repo.IsWriter() && ctx.Repo.IsViewBranch {
ctx.Data["NewFileLink"] = newFileLink + "/" + treename
if !setting.Repository.Upload.Enabled {
if setting.Repository.Upload.Enabled {
ctx.Data["UploadFileLink"] = uploadFileLink + "/" + treename
}
}