From bb8297919178719c4085e0e9285727c41e4a2576 Mon Sep 17 00:00:00 2001 From: Lunny Xiao Date: Tue, 14 Jan 2025 21:57:42 -0800 Subject: [PATCH] remove duplicated code --- routers/web/repo/blame.go | 13 +------------ routers/web/repo/view_home.go | 28 ++++++++++++++++------------ 2 files changed, 17 insertions(+), 24 deletions(-) diff --git a/routers/web/repo/blame.go b/routers/web/repo/blame.go index 31a6a577728a7..808d2cb052c6b 100644 --- a/routers/web/repo/blame.go +++ b/routers/web/repo/blame.go @@ -46,18 +46,7 @@ func RefBlame(ctx *context.Context) { return } - showFileViewTreeSidebar := true - if ctx.Doer != nil { - v, err := user_model.GetUserSetting(ctx, ctx.Doer.ID, user_model.SettingsKeyShowFileViewTreeSidebar, "true") - if err != nil { - log.Error("GetUserSetting: %v", err) - } else { - showFileViewTreeSidebar, _ = strconv.ParseBool(v) - } - } - ctx.Data["RepoPreferences"] = &preferencesForm{ - ShowFileViewTreeSidebar: showFileViewTreeSidebar, - } + prepareHomeTreeSideBarSwitch(ctx) branchLink := ctx.Repo.RepoLink + "/src/" + ctx.Repo.RefTypeNameSubURL() treeLink := branchLink diff --git a/routers/web/repo/view_home.go b/routers/web/repo/view_home.go index 0c5a20eff7d42..39da84b1e9dfc 100644 --- a/routers/web/repo/view_home.go +++ b/routers/web/repo/view_home.go @@ -312,6 +312,21 @@ func handleRepoHomeFeed(ctx *context.Context) bool { return false } +func prepareHomeTreeSideBarSwitch(ctx *context.Context) { + showFileViewTreeSidebar := true + if ctx.Doer != nil { + v, err := user_model.GetUserSetting(ctx, ctx.Doer.ID, user_model.SettingsKeyShowFileViewTreeSidebar, "true") + if err != nil { + log.Error("GetUserSetting: %v", err) + } else { + showFileViewTreeSidebar, _ = strconv.ParseBool(v) + } + } + ctx.Data["RepoPreferences"] = &preferencesForm{ + ShowFileViewTreeSidebar: showFileViewTreeSidebar, + } +} + // Home render repository home page func Home(ctx *context.Context) { if handleRepoHomeFeed(ctx) { @@ -325,18 +340,7 @@ func Home(ctx *context.Context) { return } - showFileViewTreeSidebar := true - if ctx.Doer != nil { - v, err := user_model.GetUserSetting(ctx, ctx.Doer.ID, user_model.SettingsKeyShowFileViewTreeSidebar, "true") - if err != nil { - log.Error("GetUserSetting: %v", err) - } else { - showFileViewTreeSidebar, _ = strconv.ParseBool(v) - } - } - ctx.Data["RepoPreferences"] = &preferencesForm{ - ShowFileViewTreeSidebar: showFileViewTreeSidebar, - } + prepareHomeTreeSideBarSwitch(ctx) title := ctx.Repo.Repository.Owner.Name + "/" + ctx.Repo.Repository.Name if len(ctx.Repo.Repository.Description) > 0 {