Nemcio/GitBucket
1
0
Fork 0
mirror of https://github.com/gitbucket/gitbucket.git synced 2025-11-07 14:05:52 +01:00
Code Issues Packages Projects Releases Wiki Activity

(refs #17)Fix wiki link.

Browse Source
This commit is contained in:
takezoe
2013-07-04 17:26:32 +09:00
parent d0f052e056
commit 869930165c
1 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/main/scala/view/Markdown.scala
View File

@@ -25,8 +25,6 @@ class GitBucketLinkRender(context: app.Context, repository: service.RepositorySe
enableWikiLink: Boolean) extends LinkRenderer { enableWikiLink: Boolean) extends LinkRenderer {
override def render(node: WikiLinkNode): Rendering = { override def render(node: WikiLinkNode): Rendering = {
if(enableWikiLink){ if(enableWikiLink){
super.render(node)
} else {
try { try {
val text = node.getText val text = node.getText
val (label, page) = if(text.contains('|')){ val (label, page) = if(text.contains('|')){
@@ -35,12 +33,14 @@ class GitBucketLinkRender(context: app.Context, repository: service.RepositorySe
} else { } else {
(text, text) (text, text)
} }
val url = "%s/%s/%s/wiki/%s".format(context.path, repository.owner, repository.name, val url = repository.url.replaceFirst("/git/", "/").replaceFirst("\\.git$", "") +
java.net.URLEncoder.encode(page.replace(' ', '-'), "UTF-8")) "/wiki/" + java.net.URLEncoder.encode(page.replace(' ', '-'), "UTF-8")
new Rendering(url, label) new Rendering(url, label)
} catch { } catch {
case e: java.io.UnsupportedEncodingException => throw new IllegalStateException(); case e: java.io.UnsupportedEncodingException => throw new IllegalStateException();
} }
} else {
super.render(node)
} }
} }
} }
@@ -96,8 +96,11 @@ class GitBucketHtmlSerializer(
} }
private def fixUrl(url: String): String = { private def fixUrl(url: String): String = {
if(!enableWikiLink || url.startsWith("http://") || url.startsWith("https://")) url if(!enableWikiLink || url.startsWith("http://") || url.startsWith("https://")){
else repository.url.replaceFirst("/git/", "/").replaceFirst("\\.git$", "") + "/wiki/_blob/" + url url
} else {
repository.url.replaceFirst("/git/", "/").replaceFirst("\\.git$", "") + "/wiki/_blob/" + url
}
} }
private def printAttribute(name: String, value: String) { private def printAttribute(name: String, value: String) {