Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
A
apollo
Project
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
openSource
apollo
Commits
ee00c5fa
Commit
ee00c5fa
authored
Aug 31, 2016
by
zhangle
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
history page use release id as anchor
parent
583b098e
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
11 additions
and
10 deletions
+11
-10
history.html
apollo-portal/src/main/resources/static/config/history.html
+2
-2
namespace-panel-directive.js
...ces/static/scripts/directive/namespace-panel-directive.js
+3
-3
namespace-panel.html
...ain/resources/static/views/component/namespace-panel.html
+6
-5
No files found.
apollo-portal/src/main/resources/static/config/history.html
View file @
ee00c5fa
...
@@ -37,7 +37,7 @@
...
@@ -37,7 +37,7 @@
<span
class=
"label label-primary no-radius"
<span
class=
"label label-primary no-radius"
ng-if=
"release.active"
>
当前生效
</span>
ng-if=
"release.active"
>
当前生效
</span>
</div>
</div>
<div
class=
"row"
id=
"{{release.baseInfo.
name
}}"
>
<div
class=
"row"
id=
"{{release.baseInfo.
id
}}"
>
<div
class=
"col-md-2 user"
>
<div
class=
"col-md-2 user"
>
<img
src=
"../img/user.png"
class=
"i-20"
>
<img
src=
"../img/user.png"
class=
"i-20"
>
<span
class=
"info"
ng-bind=
"release.baseInfo.dataChangeCreatedBy"
></span>
<span
class=
"info"
ng-bind=
"release.baseInfo.dataChangeCreatedBy"
></span>
...
@@ -50,7 +50,7 @@
...
@@ -50,7 +50,7 @@
<div
class=
"col-md-3 time"
>
<div
class=
"col-md-3 time"
>
<img
src=
"../img/title.png"
class=
"i-20"
>
<img
src=
"../img/title.png"
class=
"i-20"
>
<span
class=
"info"
<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>
<div
class=
"col-md-4 comment"
ng-show=
"release.baseInfo.comment"
>
<div
class=
"col-md-4 comment"
ng-show=
"release.baseInfo.comment"
>
...
...
apollo-portal/src/main/resources/static/scripts/directive/namespace-panel-directive.js
View file @
ee00c5fa
...
@@ -246,7 +246,7 @@ directive_module.directive('apollonspanel',
...
@@ -246,7 +246,7 @@ directive_module.directive('apollonspanel',
}
}
var
groupedInstances
=
{},
var
groupedInstances
=
{},
notLatestRelease
Name
s
=
[];
notLatestReleases
=
[];
result
.
forEach
(
function
(
instance
)
{
result
.
forEach
(
function
(
instance
)
{
var
configs
=
instance
.
configs
;
var
configs
=
instance
.
configs
;
...
@@ -255,14 +255,14 @@ directive_module.directive('apollonspanel',
...
@@ -255,14 +255,14 @@ directive_module.directive('apollonspanel',
var
release
=
instanceConfig
.
release
;
var
release
=
instanceConfig
.
release
;
if
(
!
groupedInstances
[
release
.
name
])
{
if
(
!
groupedInstances
[
release
.
name
])
{
groupedInstances
[
release
.
name
]
=
[];
groupedInstances
[
release
.
name
]
=
[];
notLatestRelease
Names
.
push
(
release
.
nam
e
);
notLatestRelease
s
.
push
(
releas
e
);
}
}
groupedInstances
[
release
.
name
].
push
(
instance
);
groupedInstances
[
release
.
name
].
push
(
instance
);
})
})
}
}
});
});
namespace
.
notLatestRelease
Names
=
notLatestReleaseNam
es
;
namespace
.
notLatestRelease
s
=
notLatestReleas
es
;
namespace
.
notLatestReleaseInstances
=
groupedInstances
;
namespace
.
notLatestReleaseInstances
=
groupedInstances
;
})
})
...
...
apollo-portal/src/main/resources/static/views/component/namespace-panel.html
View file @
ee00c5fa
...
@@ -375,7 +375,7 @@
...
@@ -375,7 +375,7 @@
<div
class=
"panel-default"
ng-if=
"namespace.latestReleaseInstances.total > 0"
>
<div
class=
"panel-default"
ng-if=
"namespace.latestReleaseInstances.total > 0"
>
<div
class=
"panel-heading"
>
<div
class=
"panel-heading"
>
<a
target=
"_blank"
data-tooltip=
"tooltip"
data-placement=
"bottom"
title=
"查看配置"
<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}}
{{namespace.latestRelease.name}}
</a>
</a>
</div>
</div>
...
@@ -410,11 +410,12 @@
...
@@ -410,11 +410,12 @@
<!--not latest release instances-->
<!--not latest release instances-->
<div
class=
"panel-body"
ng-show=
"namespace.instanceViewType == 'not_latest_release'"
>
<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"
>
<div
class=
"panel-heading"
>
<a
target=
"_blank"
data-tooltip=
"tooltip"
data-placement=
"bottom"
title=
"查看配置"
<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
}}"
>
href=
"/config/history.html?#/appid={{appId}}&env={{env}}&clusterName={{cluster}}&namespaceName={{namespace.baseInfo.namespaceName}}&scrollTo={{release
.id
}}"
>
{{release
N
ame}}
{{release
.n
ame}}
</a>
</a>
</div>
</div>
...
@@ -428,7 +429,7 @@
...
@@ -428,7 +429,7 @@
</tr>
</tr>
</thead>
</thead>
<tbody>
<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.appId"
></td>
<td
width=
"25%"
ng-bind=
"instance.clusterName"
></td>
<td
width=
"25%"
ng-bind=
"instance.clusterName"
></td>
<td
width=
"25%"
ng-bind=
"instance.dataCenter"
></td>
<td
width=
"25%"
ng-bind=
"instance.dataCenter"
></td>
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment