Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
LinuxSuRen
jenkins
提交
9447289c
J
jenkins
项目概览
LinuxSuRen
/
jenkins
与 Fork 源项目一致
从无法访问的项目Fork
通知
2
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
J
jenkins
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
9447289c
编写于
2月 28, 2013
作者:
K
Kohsuke Kawaguchi
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
[FIXED JENKINS-16368]
HyperlinkNote shouldn't emit the absolute URL.
上级
00bfa356
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
18 addition
and
2 deletion
+18
-2
changelog.html
changelog.html
+3
-0
core/src/main/java/hudson/Functions.java
core/src/main/java/hudson/Functions.java
+2
-0
core/src/main/java/hudson/console/HyperlinkNote.java
core/src/main/java/hudson/console/HyperlinkNote.java
+12
-2
core/src/main/java/jenkins/model/Jenkins.java
core/src/main/java/jenkins/model/Jenkins.java
+1
-0
未找到文件。
changelog.html
浏览文件 @
9447289c
...
...
@@ -64,6 +64,9 @@ Upcoming changes</a>
<li
class=
bug
>
Fixed "Manage" sub-contextmenu for non-standalone deployments
(
<a
href=
"https://github.com/jenkinsci/jenkins/pull/721"
>
pull 721
</a>
)
<li
class=
bug
>
Absolute URLs in console output
(
<a
href=
"https://issues.jenkins-ci.org/browse/JENKINS-16368"
>
issue 16368
</a>
)
<li
class=
bug
>
Revert ampersand encoding which can cause backwad incompatibility issue
(
<a
href=
"https://github.com/jenkinsci/jenkins/pull/683"
>
pull 683
</a>
)
...
...
core/src/main/java/hudson/Functions.java
浏览文件 @
9447289c
...
...
@@ -183,6 +183,8 @@ public class Functions {
the same thing as "/abc/def.ghi", but this avoids the stale cache
problem when the user upgrades to new Jenkins. Stapler also sets a long
future expiration dates for such static resources.
see https://wiki.jenkins-ci.org/display/JENKINS/Hyperlinks+in+HTML
*/
context
.
setVariable
(
"resURL"
,
rootURL
+
getResourcePath
());
context
.
setVariable
(
"imagesURL"
,
rootURL
+
getResourcePath
()+
"/images"
);
...
...
core/src/main/java/hudson/console/HyperlinkNote.java
浏览文件 @
9447289c
...
...
@@ -26,6 +26,8 @@ package hudson.console;
import
hudson.Extension
;
import
hudson.MarkupText
;
import
jenkins.model.Jenkins
;
import
org.kohsuke.stapler.Stapler
;
import
org.kohsuke.stapler.StaplerRequest
;
import
java.io.IOException
;
import
java.util.logging.Level
;
...
...
@@ -53,8 +55,16 @@ public class HyperlinkNote extends ConsoleNote {
@Override
public
ConsoleAnnotator
annotate
(
Object
context
,
MarkupText
text
,
int
charPos
)
{
String
url
=
this
.
url
;
if
(
url
.
startsWith
(
"/"
))
url
=
Jenkins
.
getInstance
().
getRootUrl
()+
url
.
substring
(
1
);
if
(
url
.
startsWith
(
"/"
))
{
StaplerRequest
req
=
Stapler
.
getCurrentRequest
();
if
(
req
!=
null
)
{
// if we are serving HTTP request, we want to use app relative URL
url
=
req
.
getContextPath
()+
url
;
}
else
{
// otherwise presumably this is rendered for e-mails and other non-HTTP stuff
url
=
Jenkins
.
getInstance
().
getRootUrl
()+
url
.
substring
(
1
);
}
}
text
.
addMarkup
(
charPos
,
charPos
+
length
,
"<a href='"
+
url
+
"'"
+
extraAttributes
()+
">"
,
"</a>"
);
return
null
;
}
...
...
core/src/main/java/jenkins/model/Jenkins.java
浏览文件 @
9447289c
...
...
@@ -1864,6 +1864,7 @@ public class Jenkins extends AbstractCIBase implements ModifiableTopLevelItemGro
* @since 1.66
* @see Descriptor#getCheckUrl(String)
* @see #getRootUrlFromRequest()
* @see <a href="https://wiki.jenkins-ci.org/display/JENKINS/Hyperlinks+in+HTML">Hyperlinks in HTML</a>
*/
public
String
getRootUrl
()
{
String
url
=
JenkinsLocationConfiguration
.
get
().
getUrl
();
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录