From b31418edd92c05d969cd6520531dfa1c78bf741e Mon Sep 17 00:00:00 2001 From: Lunny Xiao Date: Wed, 27 Apr 2022 03:19:52 +0800 Subject: [PATCH] Fix blame page select range error and some typos (#19503) Partially back port from #19500 and fix two typos. --- docs/content/doc/installation/with-docker.fr-fr.md | 2 +- models/migrations/migrations.go | 2 +- web_src/js/features/repo-code.js | 7 +++---- 3 files changed, 5 insertions(+), 6 deletions(-) diff --git a/docs/content/doc/installation/with-docker.fr-fr.md b/docs/content/doc/installation/with-docker.fr-fr.md index 0011ba2ff..176abf7a1 100644 --- a/docs/content/doc/installation/with-docker.fr-fr.md +++ b/docs/content/doc/installation/with-docker.fr-fr.md @@ -43,7 +43,7 @@ Vous devriez avoir une instance fonctionnelle de Gitea. Pour accèder à l'inter ## Named Volumes -Ce guide aboutira à une installation avec les données Gita et PostgreSQL stockées dans des volumes nommés. Cela permet une sauvegarde, une restauration et des mises à niveau en toute simplicité. +Ce guide aboutira à une installation avec les données Gitea et PostgreSQL stockées dans des volumes nommés. Cela permet une sauvegarde, une restauration et des mises à niveau en toute simplicité. ### The Database diff --git a/models/migrations/migrations.go b/models/migrations/migrations.go index 31b172a68..6dff3e055 100644 --- a/models/migrations/migrations.go +++ b/models/migrations/migrations.go @@ -453,7 +453,7 @@ Please try upgrading to a lower version first (suggested v1.6.4), then upgrade t // Downgrading Gitea's database version not supported if int(v-minDBVersion) > len(migrations) { - msg := fmt.Sprintf("Your database (migration version: %d) is for a newer Gita, you can not use the newer database for this old Gitea release (%d).", v, minDBVersion+len(migrations)) + msg := fmt.Sprintf("Your database (migration version: %d) is for a newer Gitea, you can not use the newer database for this old Gitea release (%d).", v, minDBVersion+len(migrations)) msg += "\nGitea will exit to keep your database safe and unchanged. Please use the correct Gitea release, do not change the migration version manually (incorrect manual operation may lose data)." if !setting.IsProd { msg += fmt.Sprintf("\nIf you are in development and really know what you're doing, you can force changing the migration version by executing: UPDATE version SET version=%d WHERE id=1;", minDBVersion+len(migrations)) diff --git a/web_src/js/features/repo-code.js b/web_src/js/features/repo-code.js index 96a923571..eee239177 100644 --- a/web_src/js/features/repo-code.js +++ b/web_src/js/features/repo-code.js @@ -15,10 +15,6 @@ function selectRange($list, $select, $from) { const $issue = $('a.ref-in-new-issue'); const $copyPermalink = $('a.copy-line-permalink'); - if ($copyPermalink.length === 0) { - return; - } - const updateIssueHref = function (anchor) { if ($issue.length === 0) { return; @@ -29,6 +25,9 @@ function selectRange($list, $select, $from) { }; const updateCopyPermalinkHref = function(anchor) { + if ($copyPermalink.length === 0) { + return; + } let link = $copyPermalink.attr('data-clipboard-text'); link = `${link.replace(/#L\d+$|#L\d+-L\d+$/, '')}#${anchor}`; $copyPermalink.attr('data-clipboard-text', link);