Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
wrr-cat
apollo
提交
343bb1d0
apollo
项目概览
wrr-cat
/
apollo
与 Fork 源项目一致
从无法访问的项目Fork
通知
2
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
apollo
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
343bb1d0
编写于
8月 31, 2016
作者:
J
Jason Song
提交者:
GitHub
8月 31, 2016
浏览文件
操作
浏览文件
下载
差异文件
Merge pull request #398 from lepdou/search_item
history page use release id as anchor
上级
f3708887
ee00c5fa
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
11 addition
and
10 deletion
+11
-10
apollo-portal/src/main/resources/static/config/history.html
apollo-portal/src/main/resources/static/config/history.html
+2
-2
apollo-portal/src/main/resources/static/scripts/directive/namespace-panel-directive.js
...ces/static/scripts/directive/namespace-panel-directive.js
+3
-3
apollo-portal/src/main/resources/static/views/component/namespace-panel.html
...ain/resources/static/views/component/namespace-panel.html
+6
-5
未找到文件。
apollo-portal/src/main/resources/static/config/history.html
浏览文件 @
343bb1d0
...
...
@@ -37,7 +37,7 @@
<span
class=
"label label-primary no-radius"
ng-if=
"release.active"
>
当前生效
</span>
</div>
<div
class=
"row"
id=
"{{release.baseInfo.
name
}}"
>
<div
class=
"row"
id=
"{{release.baseInfo.
id
}}"
>
<div
class=
"col-md-2 user"
>
<img
src=
"../img/user.png"
class=
"i-20"
>
<span
class=
"info"
ng-bind=
"release.baseInfo.dataChangeCreatedBy"
></span>
...
...
@@ -50,7 +50,7 @@
<div
class=
"col-md-3 time"
>
<img
src=
"../img/title.png"
class=
"i-20"
>
<span
class=
"info"
ng-bind=
"release.baseInfo.name"
ng-class=
"{'highlight':pageContext.scrollTo == release.baseInfo.
name
}"
></span>
ng-bind=
"release.baseInfo.name"
ng-class=
"{'highlight':pageContext.scrollTo == release.baseInfo.
id
}"
></span>
</div>
<div
class=
"col-md-4 comment"
ng-show=
"release.baseInfo.comment"
>
...
...
apollo-portal/src/main/resources/static/scripts/directive/namespace-panel-directive.js
浏览文件 @
343bb1d0
...
...
@@ -246,7 +246,7 @@ directive_module.directive('apollonspanel',
}
var
groupedInstances
=
{},
notLatestRelease
Name
s
=
[];
notLatestReleases
=
[];
result
.
forEach
(
function
(
instance
)
{
var
configs
=
instance
.
configs
;
...
...
@@ -255,14 +255,14 @@ directive_module.directive('apollonspanel',
var
release
=
instanceConfig
.
release
;
if
(
!
groupedInstances
[
release
.
name
])
{
groupedInstances
[
release
.
name
]
=
[];
notLatestRelease
Names
.
push
(
release
.
nam
e
);
notLatestRelease
s
.
push
(
releas
e
);
}
groupedInstances
[
release
.
name
].
push
(
instance
);
})
}
});
namespace
.
notLatestRelease
Names
=
notLatestReleaseNam
es
;
namespace
.
notLatestRelease
s
=
notLatestReleas
es
;
namespace
.
notLatestReleaseInstances
=
groupedInstances
;
})
...
...
apollo-portal/src/main/resources/static/views/component/namespace-panel.html
浏览文件 @
343bb1d0
...
...
@@ -375,7 +375,7 @@
<div
class=
"panel-default"
ng-if=
"namespace.latestReleaseInstances.total > 0"
>
<div
class=
"panel-heading"
>
<a
target=
"_blank"
data-tooltip=
"tooltip"
data-placement=
"bottom"
title=
"查看配置"
href=
"/config/history.html?#/appid={{appId}}&env={{env}}&clusterName={{cluster}}&namespaceName={{namespace.baseInfo.namespaceName}}&scrollTo={{namespace.latestRelease.
name
}}"
>
href=
"/config/history.html?#/appid={{appId}}&env={{env}}&clusterName={{cluster}}&namespaceName={{namespace.baseInfo.namespaceName}}&scrollTo={{namespace.latestRelease.
id
}}"
>
{{namespace.latestRelease.name}}
</a>
</div>
...
...
@@ -410,11 +410,12 @@
<!--not latest release instances-->
<div
class=
"panel-body"
ng-show=
"namespace.instanceViewType == 'not_latest_release'"
>
<div
class=
"panel-default"
ng-if=
"namespace.instancesCount - namespace.latestReleaseInstances.total > 0"
ng-repeat=
"releaseName in namespace.notLatestReleaseNames"
>
<div
class=
"panel-default"
ng-if=
"namespace.instancesCount - namespace.latestReleaseInstances.total > 0"
ng-repeat=
"release in namespace.notLatestReleases"
>
<div
class=
"panel-heading"
>
<a
target=
"_blank"
data-tooltip=
"tooltip"
data-placement=
"bottom"
title=
"查看配置"
href=
"/config/history.html?#/appid={{appId}}&env={{env}}&clusterName={{cluster}}&namespaceName={{namespace.baseInfo.namespaceName}}&scrollTo={{release
Name
}}"
>
{{release
N
ame}}
href=
"/config/history.html?#/appid={{appId}}&env={{env}}&clusterName={{cluster}}&namespaceName={{namespace.baseInfo.namespaceName}}&scrollTo={{release
.id
}}"
>
{{release
.n
ame}}
</a>
</div>
...
...
@@ -428,7 +429,7 @@
</tr>
</thead>
<tbody>
<tr
ng-repeat=
"instance in namespace.notLatestReleaseInstances[release
N
ame]"
>
<tr
ng-repeat=
"instance in namespace.notLatestReleaseInstances[release
.n
ame]"
>
<td
width=
"25%"
ng-bind=
"instance.appId"
></td>
<td
width=
"25%"
ng-bind=
"instance.clusterName"
></td>
<td
width=
"25%"
ng-bind=
"instance.dataCenter"
></td>
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录