Fixed wrong AppSubUrl in multiple templates (#10447)

* Fixed wrong AppSubUrl in OAuth2 app edit page * Replaced all other occurrences of $.AppSubURL for support of sub-paths
go-gitea · Feb 25, 2020 · bab6e1e · bab6e1e
1 parent 85e6a12
commit bab6e1e
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/templates/explore/code.tmpl b/templates/explore/code.tmpl
@@ -18,7 +18,7 @@
  </h3>
  <div>
  {{range $term := .SearchResultLanguages}}
- <a class="ui {{if eq $.Language $term.Language}}primary {{end}}basic label" href="{{$.AppSubURL}}/explore/code?q={{$.Keyword}}{{if ne $.Language $term.Language}}&l={{$term.Language}}{{end}}">
+ <a class="ui {{if eq $.Language $term.Language}}primary {{end}}basic label" href="{{AppSubUrl}}/explore/code?q={{$.Keyword}}{{if ne $.Language $term.Language}}&l={{$term.Language}}{{end}}">
  <i class="color-icon" style="background-color: {{$term.Color}}"></i>
  {{$term.Language}}
  <div class="detail">{{$term.Count}}</div>

diff --git a/templates/repo/settings/lfs_locks.tmpl b/templates/repo/settings/lfs_locks.tmpl
@@ -34,7 +34,7 @@
  {{end}}
  </td>
  <td>
- <a href="{{$.AppSubUrl}}/{{$lock.Owner.Name}}">
+ <a href="{{AppSubUrl}}/{{$lock.Owner.Name}}">
  <img class="ui avatar image" src="{{$lock.Owner.RelAvatarLink}}">
  {{$lock.Owner.DisplayName}}
  </a>

diff --git a/templates/user/settings/applications_oauth2_edit.tmpl b/templates/user/settings/applications_oauth2_edit.tmpl
@@ -30,14 +30,14 @@
  <div class="item">
  <!-- TODO add regenerate secret functionality */ -->
  {{.i18n.Tr "settings.oauth2_regenerate_secret_hint"}}
- <form class="ui form ignore-dirty" action="{{$.AppSubURL}}/user/settings/applications/oauth2/{{.App.ID}}/regenerate_secret" method="post">
+ <form class="ui form ignore-dirty" action="{{AppSubUrl}}/user/settings/applications/oauth2/{{.App.ID}}/regenerate_secret" method="post">
  {{.CsrfTokenHtml}}
  <a href="#" onclick="event.target.parentNode.submit()">{{.i18n.Tr "settings.oauth2_regenerate_secret"}}</a>
  </form>
  </div>
  </div>
  <div class="ui attached bottom segment">
- <form class="ui form ignore-dirty" action="{{$.AppSubURL}}/user/settings/applications/oauth2/{{.App.ID}}" method="post">
+ <form class="ui form ignore-dirty" action="{{AppSubUrl}}/user/settings/applications/oauth2/{{.App.ID}}" method="post">
  {{.CsrfTokenHtml}}
  <div class="field {{if .Err_AppName}}error{{end}}">
  <label for="application-name">{{.i18n.Tr "settings.oauth2_application_name"}}</label>