From e7fbc551ab7b743761f90997864ed8c11e4f9c39 Mon Sep 17 00:00:00 2001 From: jaqra <48099350+jaqra@users.noreply.github.com> Date: Tue, 29 Oct 2019 23:50:38 +0300 Subject: [PATCH 1/2] apply exclude label on milestone issue list (#8739) * apply exclude label on milestone issue list * remove __debug.bin file --- templates/repo/issue/milestone_issues.tmpl | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/templates/repo/issue/milestone_issues.tmpl b/templates/repo/issue/milestone_issues.tmpl index 889cd2c2f6..b347ad90e4 100644 --- a/templates/repo/issue/milestone_issues.tmpl +++ b/templates/repo/issue/milestone_issues.tmpl @@ -50,17 +50,18 @@
-
+
-
+
{{.i18n.Tr "repo.issues.filter_label"}}
+ {{.i18n.Tr "repo.issues.filter_label_exclude" | Safe}} {{.i18n.Tr "repo.issues.filter_label_no_select"}} {{range .Labels}} - {{.Name}} + {{.Name}} {{end}}
From 7bb817e6d19f21ccb16c6ba1eecd0e89fd052322 Mon Sep 17 00:00:00 2001 From: Benno Date: Wed, 30 Oct 2019 05:32:21 +0800 Subject: [PATCH 2/2] Respect LFS File Lock on UI (#8719) * update #8687 respect file locking * upate #8687 Add LFS locker information * update #8719 enhance coding style and return error --- models/repo.go | 16 ++++++++++++++++ options/locale/locale_en-US.ini | 1 + routers/repo/blame.go | 15 +++++++++++++-- routers/repo/view.go | 29 +++++++++++++++++++++++++---- templates/repo/view_file.tmpl | 6 ++++++ 5 files changed, 61 insertions(+), 6 deletions(-) diff --git a/models/repo.go b/models/repo.go index ac3443f895..7945cb309d 100644 --- a/models/repo.go +++ b/models/repo.go @@ -2810,3 +2810,19 @@ func (repo *Repository) GetOriginalURLHostname() string { return u.Host } + +// GetTreePathLock returns LSF lock for the treePath +func (repo *Repository) GetTreePathLock(treePath string) (*LFSLock, error) { + if setting.LFS.StartServer { + locks, err := GetLFSLockByRepoID(repo.ID) + if err != nil { + return nil, err + } + for _, lock := range locks { + if lock.Path == treePath { + return lock, nil + } + } + } + return nil, nil +} diff --git a/options/locale/locale_en-US.ini b/options/locale/locale_en-US.ini index 4210ed1212..4d1af69db5 100644 --- a/options/locale/locale_en-US.ini +++ b/options/locale/locale_en-US.ini @@ -703,6 +703,7 @@ editor.preview_changes = Preview Changes editor.cannot_edit_lfs_files = LFS files cannot be edited in the web interface. editor.cannot_edit_non_text_files = Binary files cannot be edited in the web interface. editor.edit_this_file = Edit File +editor.this_file_locked = File is locked editor.must_be_on_a_branch = You must be on a branch to make or propose changes to this file. editor.fork_before_edit = You must fork this repository to make or propose changes to this file. editor.delete_this_file = Delete File diff --git a/routers/repo/blame.go b/routers/repo/blame.go index 5578942a9f..f5a2a548e3 100644 --- a/routers/repo/blame.go +++ b/routers/repo/blame.go @@ -119,8 +119,19 @@ func RefBlame(ctx *context.Context) { ctx.Data["IsBlame"] = true if ctx.Repo.CanEnableEditor() { - ctx.Data["CanDeleteFile"] = true - ctx.Data["DeleteFileTooltip"] = ctx.Tr("repo.editor.delete_this_file") + // Check LFS Lock + lfsLock, err := ctx.Repo.Repository.GetTreePathLock(ctx.Repo.TreePath) + if err != nil { + ctx.ServerError("GetTreePathLock", err) + return + } + if lfsLock != nil && lfsLock.OwnerID != ctx.User.ID { + ctx.Data["CanDeleteFile"] = false + ctx.Data["DeleteFileTooltip"] = ctx.Tr("repo.editor.this_file_locked") + } else { + ctx.Data["CanDeleteFile"] = true + ctx.Data["DeleteFileTooltip"] = ctx.Tr("repo.editor.delete_this_file") + } } else if !ctx.Repo.IsViewBranch { ctx.Data["DeleteFileTooltip"] = ctx.Tr("repo.editor.must_be_on_a_branch") } else if !ctx.Repo.CanWrite(models.UnitTypeCode) { diff --git a/routers/repo/view.go b/routers/repo/view.go index da6d426de4..8730523d89 100644 --- a/routers/repo/view.go +++ b/routers/repo/view.go @@ -265,6 +265,17 @@ func renderFile(ctx *context.Context, entry *git.TreeEntry, treeLink, rawLink st ctx.Data["RawFileLink"] = fmt.Sprintf("%s%s.git/info/lfs/objects/%s/%s", setting.AppURL, ctx.Repo.Repository.FullName(), meta.Oid, filenameBase64) } } + // Check LFS Lock + lfsLock, err := ctx.Repo.Repository.GetTreePathLock(ctx.Repo.TreePath) + ctx.Data["LFSLock"] = lfsLock + if err != nil { + ctx.ServerError("GetTreePathLock", err) + return + } + if lfsLock != nil { + ctx.Data["LFSLockOwner"] = lfsLock.Owner.DisplayName() + ctx.Data["LFSLockHint"] = ctx.Tr("repo.editor.this_file_locked") + } // Assume file is not editable first. if isLFSFile { @@ -334,8 +345,13 @@ func renderFile(ctx *context.Context, entry *git.TreeEntry, treeLink, rawLink st } if !isLFSFile { if ctx.Repo.CanEnableEditor() { - ctx.Data["CanEditFile"] = true - ctx.Data["EditFileTooltip"] = ctx.Tr("repo.editor.edit_this_file") + if lfsLock != nil && lfsLock.OwnerID != ctx.User.ID { + ctx.Data["CanEditFile"] = false + ctx.Data["EditFileTooltip"] = ctx.Tr("repo.editor.this_file_locked") + } else { + ctx.Data["CanEditFile"] = true + ctx.Data["EditFileTooltip"] = ctx.Tr("repo.editor.edit_this_file") + } } else if !ctx.Repo.IsViewBranch { ctx.Data["EditFileTooltip"] = ctx.Tr("repo.editor.must_be_on_a_branch") } else if !ctx.Repo.CanWrite(models.UnitTypeCode) { @@ -368,8 +384,13 @@ func renderFile(ctx *context.Context, entry *git.TreeEntry, treeLink, rawLink st } if ctx.Repo.CanEnableEditor() { - ctx.Data["CanDeleteFile"] = true - ctx.Data["DeleteFileTooltip"] = ctx.Tr("repo.editor.delete_this_file") + if lfsLock != nil && lfsLock.OwnerID != ctx.User.ID { + ctx.Data["CanDeleteFile"] = false + ctx.Data["DeleteFileTooltip"] = ctx.Tr("repo.editor.this_file_locked") + } else { + ctx.Data["CanDeleteFile"] = true + ctx.Data["DeleteFileTooltip"] = ctx.Tr("repo.editor.delete_this_file") + } } else if !ctx.Repo.IsViewBranch { ctx.Data["DeleteFileTooltip"] = ctx.Tr("repo.editor.must_be_on_a_branch") } else if !ctx.Repo.CanWrite(models.UnitTypeCode) { diff --git a/templates/repo/view_file.tmpl b/templates/repo/view_file.tmpl index 616ca25650..f95076272e 100644 --- a/templates/repo/view_file.tmpl +++ b/templates/repo/view_file.tmpl @@ -16,6 +16,12 @@ {{FileSize .FileSize}}{{if .IsLFSFile}} ({{.i18n.Tr "repo.stored_lfs"}}){{end}}
{{end}} + {{if .LFSLock}} +
+ + {{.LFSLockOwner}} +
+ {{end}}
{{end}}