mirror of
https://codeberg.org/forgejo/forgejo.git
synced 2024-11-01 06:48:56 +00:00
30a783879f
Backport #24936 If enabled show a clickable label in the comment. A click on the label opens the Conversation tab with the comment focussed - there you're able to view the old diff (or original diff the comment was created on). **Screenshots** ![image](https://github.com/go-gitea/gitea/assets/1135157/63ab9571-a9ee-4900-9f02-94ab0095f9e7) ![image](https://github.com/go-gitea/gitea/assets/1135157/78f7c225-8d76-46f5-acfd-9b8aab988a6c) When resolved and outdated: ![image](https://github.com/go-gitea/gitea/assets/1135157/6ece9ebd-c792-4aa5-9c35-628694e9d093) Option to enable/disable this (stored in user settings - default is disabled): ![image](https://github.com/go-gitea/gitea/assets/1135157/ed99dfe4-76dc-4c12-bd96-e7e62da50ab5) ![image](https://github.com/go-gitea/gitea/assets/1135157/e837a052-e92e-4a28-906d-9db5bacf93a6) fixes #24913 Co-authored-by: silverwind <me@silverwind.io>
115 lines
3.5 KiB
Go
115 lines
3.5 KiB
Go
// Copyright 2020 The Gitea Authors. All rights reserved.
|
|
// SPDX-License-Identifier: MIT
|
|
|
|
package repo
|
|
|
|
import (
|
|
"fmt"
|
|
"strconv"
|
|
|
|
system_model "code.gitea.io/gitea/models/system"
|
|
user_model "code.gitea.io/gitea/models/user"
|
|
"code.gitea.io/gitea/modules/context"
|
|
"code.gitea.io/gitea/modules/git"
|
|
)
|
|
|
|
// SetEditorconfigIfExists set editor config as render variable
|
|
func SetEditorconfigIfExists(ctx *context.Context) {
|
|
if ctx.Repo.Repository.IsEmpty {
|
|
ctx.Data["Editorconfig"] = nil
|
|
return
|
|
}
|
|
|
|
ec, _, err := ctx.Repo.GetEditorconfig()
|
|
|
|
if err != nil && !git.IsErrNotExist(err) {
|
|
description := fmt.Sprintf("Error while getting .editorconfig file: %v", err)
|
|
if err := system_model.CreateRepositoryNotice(description); err != nil {
|
|
ctx.ServerError("ErrCreatingReporitoryNotice", err)
|
|
}
|
|
return
|
|
}
|
|
|
|
ctx.Data["Editorconfig"] = ec
|
|
}
|
|
|
|
// SetDiffViewStyle set diff style as render variable
|
|
func SetDiffViewStyle(ctx *context.Context) {
|
|
queryStyle := ctx.FormString("style")
|
|
|
|
if !ctx.IsSigned {
|
|
ctx.Data["IsSplitStyle"] = queryStyle == "split"
|
|
return
|
|
}
|
|
|
|
var (
|
|
userStyle = ctx.Doer.DiffViewStyle
|
|
style string
|
|
)
|
|
|
|
if queryStyle == "unified" || queryStyle == "split" {
|
|
style = queryStyle
|
|
} else if userStyle == "unified" || userStyle == "split" {
|
|
style = userStyle
|
|
} else {
|
|
style = "unified"
|
|
}
|
|
|
|
ctx.Data["IsSplitStyle"] = style == "split"
|
|
if err := user_model.UpdateUserDiffViewStyle(ctx.Doer, style); err != nil {
|
|
ctx.ServerError("ErrUpdateDiffViewStyle", err)
|
|
}
|
|
}
|
|
|
|
// SetWhitespaceBehavior set whitespace behavior as render variable
|
|
func SetWhitespaceBehavior(ctx *context.Context) {
|
|
const defaultWhitespaceBehavior = "show-all"
|
|
whitespaceBehavior := ctx.FormString("whitespace")
|
|
switch whitespaceBehavior {
|
|
case "", "ignore-all", "ignore-eol", "ignore-change":
|
|
break
|
|
default:
|
|
whitespaceBehavior = defaultWhitespaceBehavior
|
|
}
|
|
if ctx.IsSigned {
|
|
userWhitespaceBehavior, err := user_model.GetUserSetting(ctx.Doer.ID, user_model.SettingsKeyDiffWhitespaceBehavior, defaultWhitespaceBehavior)
|
|
if err == nil {
|
|
if whitespaceBehavior == "" {
|
|
whitespaceBehavior = userWhitespaceBehavior
|
|
} else if whitespaceBehavior != userWhitespaceBehavior {
|
|
_ = user_model.SetUserSetting(ctx.Doer.ID, user_model.SettingsKeyDiffWhitespaceBehavior, whitespaceBehavior)
|
|
}
|
|
} // else: we can ignore the error safely
|
|
}
|
|
|
|
// these behaviors are for gitdiff.GetWhitespaceFlag
|
|
if whitespaceBehavior == "" {
|
|
ctx.Data["WhitespaceBehavior"] = defaultWhitespaceBehavior
|
|
} else {
|
|
ctx.Data["WhitespaceBehavior"] = whitespaceBehavior
|
|
}
|
|
}
|
|
|
|
// SetShowOutdatedComments set the show outdated comments option as context variable
|
|
func SetShowOutdatedComments(ctx *context.Context) {
|
|
showOutdatedCommentsValue := ctx.FormString("show-outdated")
|
|
// var showOutdatedCommentsValue string
|
|
|
|
if showOutdatedCommentsValue != "true" && showOutdatedCommentsValue != "false" {
|
|
// invalid or no value for this form string -> use default or stored user setting
|
|
if ctx.IsSigned {
|
|
showOutdatedCommentsValue, _ = user_model.GetUserSetting(ctx.Doer.ID, user_model.SettingsKeyShowOutdatedComments, "false")
|
|
} else {
|
|
// not logged in user -> use the default value
|
|
showOutdatedCommentsValue = "false"
|
|
}
|
|
} else {
|
|
// valid value -> update user setting if user is logged in
|
|
if ctx.IsSigned {
|
|
_ = user_model.SetUserSetting(ctx.Doer.ID, user_model.SettingsKeyShowOutdatedComments, showOutdatedCommentsValue)
|
|
}
|
|
}
|
|
|
|
showOutdatedComments, _ := strconv.ParseBool(showOutdatedCommentsValue)
|
|
ctx.Data["ShowOutdatedComments"] = showOutdatedComments
|
|
}
|