diff options
| author | mrsdizzie <info@mrsdizzie.com> | 2019-04-12 01:53:34 -0400 |
|---|---|---|
| committer | Lauris BH <lauris@nix.lv> | 2019-04-12 08:53:34 +0300 |
| commit | 3ff0a126e12109b6c3aceaa229dd1bf229b6ad4b (patch) | |
| tree | d3201fa81e7b6dc01d238ec7b833456e47463d6c /templates/repo/issue | |
| parent | 3186ef554cdbf54e1a3328ffcb35ea18105d7cb1 (diff) | |
| download | gitea-3ff0a126e12109b6c3aceaa229dd1bf229b6ad4b.tar.gz gitea-3ff0a126e12109b6c3aceaa229dd1bf229b6ad4b.zip | |
Improve issue autolinks (#6273)
* Improve issue autolinks
Update autolinks to match what github does here:
Issue in same repo: #1
Issue in different repo: org/repo#1
Fixes #6264
* Use setting.AppURL when parsing URL
Using setting.AppURL here is a more reliable way of parsing the current
URL and what other functions in this file seem to use.
* Make ComposeMetas always return a valid context
* Add per repository markdown renderers for better context
* Update for use of context metas
Now that we include the user and repo name inside context metas, update
various code and tests for this new logic
Diffstat (limited to 'templates/repo/issue')
| -rw-r--r-- | templates/repo/issue/comment_tab.tmpl | 4 | ||||
| -rw-r--r-- | templates/repo/issue/view_content.tmpl | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/templates/repo/issue/comment_tab.tmpl b/templates/repo/issue/comment_tab.tmpl index b1630824e5..be113e539a 100644 --- a/templates/repo/issue/comment_tab.tmpl +++ b/templates/repo/issue/comment_tab.tmpl @@ -1,10 +1,10 @@ <div class="field"> <div class="ui top attached tabular menu" data-write="write" data-preview="preview"> <a class="active item" data-tab="write">{{.i18n.Tr "write"}}</a> - <a class="item" data-tab="preview" data-url="{{AppSubUrl}}/api/v1/markdown" data-context="{{.RepoLink}}">{{.i18n.Tr "preview"}}</a> + <a class="item" data-tab="preview" data-url="{{.Repository.APIURL}}/markdown" data-context="{{.RepoLink}}">{{.i18n.Tr "preview"}}</a> </div> <div class="ui bottom attached active tab segment" data-tab="write"> - <textarea id="content" class="edit_area js-quick-submit" name="content" tabindex="4" data-id="issue-{{.RepoName}}" data-url="{{AppSubUrl}}/api/v1/markdown" data-context="{{.Repo.RepoLink}}"> + <textarea id="content" class="edit_area js-quick-submit" name="content" tabindex="4" data-id="issue-{{.RepoName}}" data-url="{{.Repository.APIURL}}/markdown" data-context="{{.Repo.RepoLink}}"> {{if .BodyQuery}}{{.BodyQuery}}{{else if .IssueTemplate}}{{.IssueTemplate}}{{else if .PullRequestTemplate}}{{.PullRequestTemplate}}{{else}}{{.content}}{{end}}</textarea> </div> <div class="ui bottom attached tab segment markdown" data-tab="preview"> diff --git a/templates/repo/issue/view_content.tmpl b/templates/repo/issue/view_content.tmpl index 7445dcce86..cb58fbef63 100644 --- a/templates/repo/issue/view_content.tmpl +++ b/templates/repo/issue/view_content.tmpl @@ -156,7 +156,7 @@ <div class="ui comment form"> <div class="ui top attached tabular menu"> <a class="active write item">{{$.i18n.Tr "write"}}</a> - <a class="preview item" data-url="{{AppSubUrl}}/api/v1/markdown" data-context="{{$.RepoLink}}">{{$.i18n.Tr "preview"}}</a> + <a class="preview item" data-url="{{$.Repository.APIURL}}/markdown" data-context="{{$.RepoLink}}">{{$.i18n.Tr "preview"}}</a> </div> <div class="ui bottom attached active write tab segment"> <textarea tabindex="1" name="content"></textarea> |