Fix push mirror address backend get error Address cause setting page display error...

Co-authored-by: 6543 <6543@obermui.de>
Co-authored-by: Lunny Xiao <xiaolunwen@gmail.com>

diff --git a/modules/templates/helper.go b/modules/templates/helper.go
index 8a15cec2c68a053931f04e7f2b71a8cd3a549750..602afec4135fc0b0d9cec4f3c3a4941b7d25008d 100644 (file)
--- a/modules/templates/helper.go
+++ b/modules/templates/helper.go
@@ -972,11 +972,11 @@ type remoteAddress struct {
        Password string
 }
 
-func mirrorRemoteAddress(ctx context.Context, m *repo_model.Repository, remoteName string) remoteAddress {
+func mirrorRemoteAddress(ctx context.Context, m *repo_model.Repository, remoteName string, ignoreOriginalURL bool) remoteAddress {
        a := remoteAddress{}
 
        remoteURL := m.OriginalURL
-       if remoteURL == "" {
+       if ignoreOriginalURL || remoteURL == "" {
                var err error
                remoteURL, err = git.GetRemoteAddress(ctx, m.RepoPath(), remoteName)
                if err != nil {

diff --git a/templates/repo/header.tmpl b/templates/repo/header.tmpl
index 87a4a2fdafd5021963cca6a96a6dfe172d5a6a8d..e6ed76bb60fa8e99a10b23d1b40053cce1c7dc7c 100644 (file)
--- a/templates/repo/header.tmpl
+++ b/templates/repo/header.tmpl
@@ -38,7 +38,7 @@
                                        </div>
                                </div>
                                {{if $.IsPullMirror}}
-                                       {{$address := MirrorRemoteAddress $.Context . $.Mirror.GetRemoteName}}
+                                       {{$address := MirrorRemoteAddress $.Context . $.Mirror.GetRemoteName false}}
                                        <div class="fork-flag">{{$.locale.Tr "repo.mirror_from"}} <a target="_blank" rel="noopener noreferrer" href="{{$address.Address}}">{{$address.Address}}</a></div>
                                {{end}}
                                {{if .IsFork}}<div class="fork-flag">{{$.locale.Tr "repo.forked_from"}} <a href="{{.BaseRepo.Link}}">{{.BaseRepo.FullName}}</a></div>{{end}}

diff --git a/templates/repo/settings/options.tmpl b/templates/repo/settings/options.tmpl
index 98cf4f88c870f56cb5faeef374ff3aaeb538f21a..f34057d9c05e125e535357964463579890acadc8 100644 (file)
--- a/templates/repo/settings/options.tmpl
+++ b/templates/repo/settings/options.tmpl
@@ -91,7 +91,7 @@
                                        {{if .Repository.IsMirror}}
                                        <tbody>
                                                <tr>
-                                                       <td>{{(MirrorRemoteAddress $.Context .Repository .Mirror.GetRemoteName).Address}}</td>
+                                                       <td>{{(MirrorRemoteAddress $.Context .Repository .Mirror.GetRemoteName false).Address}}</td>
                                                        <td>{{$.locale.Tr "repo.settings.mirror_settings.direction.pull"}}</td>
                                                        <td>{{.Mirror.UpdatedUnix.AsTime}}</td>
                                                        <td class="right aligned">
@@ -119,7 +119,7 @@
                                                                                <label for="interval">{{.locale.Tr "repo.mirror_interval" .MinimumMirrorInterval}}</label>
                                                                                <input id="interval" name="interval" value="{{.MirrorInterval}}">
                                                                        </div>
-                                                                       {{$address := MirrorRemoteAddress $.Context .Repository .Mirror.GetRemoteName}}
+                                                                       {{$address := MirrorRemoteAddress $.Context .Repository .Mirror.GetRemoteName false}}
                                                                        <div class="field {{if .Err_MirrorAddress}}error{{end}}">
                                                                                <label for="mirror_address">{{.locale.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 $.Repository .GetRemoteName}}
+                                                       {{$address := MirrorRemoteAddress $.Context $.Repository .GetRemoteName true}}
                                                        <td>{{$address.Address}}</td>
                                                        <td>{{$.locale.Tr "repo.settings.mirror_settings.direction.push"}}</td>
                                                        <td>{{if .LastUpdateUnix}}{{.LastUpdateUnix.AsTime}}{{else}}{{$.locale.Tr "never"}}{{end}} {{if .LastError}}<div class="ui red label tooltip" data-content="{{.LastError}}">{{$.locale.Tr "error"}}</div>{{end}}</td>