diff options
| author | Lunny Xiao <xiaolunwen@gmail.com> | 2022-06-11 21:50:14 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-06-11 21:50:14 +0800 |
| commit | ce3dd04c63a048fe791ed864c2023fd37b09e427 (patch) | |
| tree | 43ed415dc8d5647b59bf54fddceb4d4a63bcc456 /templates | |
| parent | 88f2e457d891c4e91a9eddab8143d0109e08dfa9 (diff) | |
| download | gitea-ce3dd04c63a048fe791ed864c2023fd37b09e427.tar.gz gitea-ce3dd04c63a048fe791ed864c2023fd37b09e427.zip | |
Fix some mirror bugs (#18649)
* Fix some mirror bugs
* Remove unnecessary code
* Fix lint
* rename stdard url
* Allow more charactors in git ssh protocol url
* improve the detection
* support ipv6 for git url parse
* Fix bug
* Fix template
* Fix bug
* fix template
* Fix tmpl
* Fix tmpl
* Fix parse ssh with interface
* Rename functions name
Co-authored-by: zeripath <art27@cantab.net>
Diffstat (limited to 'templates')
| -rw-r--r-- | templates/repo/header.tmpl | 4 | ||||
| -rw-r--r-- | templates/repo/settings/options.tmpl | 6 |
2 files changed, 6 insertions, 4 deletions
diff --git a/templates/repo/header.tmpl b/templates/repo/header.tmpl index 2d963d67c8..cfac37cd11 100644 --- a/templates/repo/header.tmpl +++ b/templates/repo/header.tmpl @@ -37,7 +37,9 @@ {{end}} </div> </div> - {{if .IsMirror}}<div class="fork-flag">{{$.i18n.Tr "repo.mirror_from"}} <a target="_blank" rel="noopener noreferrer" href="{{if .SanitizedOriginalURL}}{{.SanitizedOriginalURL}}{{else}}{{(MirrorRemoteAddress $.Context $.Mirror).Address}}{{end}}">{{if .SanitizedOriginalURL}}{{.SanitizedOriginalURL}}{{else}}{{(MirrorRemoteAddress $.Context $.Mirror).Address}}{{end}}</a></div>{{end}} + {{if .IsMirror}} + {{$address := MirrorRemoteAddress $.Context . $.Mirror.GetRemoteName}} + <div class="fork-flag">{{$.i18n.Tr "repo.mirror_from"}} <a target="_blank" rel="noopener noreferrer" href="{{$address.Address}}">{{$address.Address}}</a></div>{{end}} {{if .IsFork}}<div class="fork-flag">{{$.i18n.Tr "repo.forked_from"}} <a href="{{.BaseRepo.Link}}">{{.BaseRepo.FullName}}</a></div>{{end}} {{if .IsGenerated}}<div class="fork-flag">{{$.i18n.Tr "repo.generated_from"}} <a href="{{.TemplateRepo.Link}}">{{.TemplateRepo.FullName}}</a></div>{{end}} </div> diff --git a/templates/repo/settings/options.tmpl b/templates/repo/settings/options.tmpl index 67a98aff43..68cbd4de2c 100644 --- a/templates/repo/settings/options.tmpl +++ b/templates/repo/settings/options.tmpl @@ -91,7 +91,7 @@ {{if .Repository.IsMirror}} <tbody> <tr> - <td>{{(MirrorRemoteAddress $.Context .Mirror).Address}}</td> + <td>{{(MirrorRemoteAddress $.Context .Repository .Mirror.GetRemoteName).Address}}</td> <td>{{$.i18n.Tr "repo.settings.mirror_settings.direction.pull"}}</td> <td>{{.Mirror.UpdatedUnix.AsTime}}</td> <td class="right aligned"> @@ -119,7 +119,7 @@ <label for="interval">{{.i18n.Tr "repo.mirror_interval" .MinimumMirrorInterval}}</label> <input id="interval" name="interval" value="{{.MirrorInterval}}"> </div> - {{$address := MirrorRemoteAddress $.Context .Mirror}} + {{$address := MirrorRemoteAddress $.Context .Repository .Mirror.GetRemoteName}} <div class="field {{if .Err_MirrorAddress}}error{{end}}"> <label for="mirror_address">{{.i18n.Tr "repo.mirror_address"}}</label> <input id="mirror_address" name="mirror_address" value="{{$address.Address}}" required> @@ -168,7 +168,7 @@ <tbody> {{range .PushMirrors}} <tr> - {{$address := MirrorRemoteAddress $.Context .}} + {{$address := MirrorRemoteAddress $.Context $.Repository .GetRemoteName}} <td>{{$address.Address}}</td> <td>{{$.i18n.Tr "repo.settings.mirror_settings.direction.push"}}</td> <td>{{if .LastUpdateUnix}}{{.LastUpdateUnix.AsTime}}{{else}}{{$.i18n.Tr "never"}}{{end}} {{if .LastError}}<div class="ui red label tooltip" data-content="{{.LastError}}">{{$.i18n.Tr "error"}}</div>{{end}}</td> |