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
eb6af6f0
Commit
eb6af6f0
authored
Jul 27, 2016
by
lepdou
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
update
parent
1f93272b
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
7 additions
and
6 deletions
+7
-6
ItemController.java
...ip/framework/apollo/portal/controller/ItemController.java
+1
-1
SyncConfigController.js
.../static/scripts/controller/config/SyncConfigController.js
+1
-1
namespace-panel.html
...ain/resources/static/views/component/namespace-panel.html
+5
-4
No files found.
apollo-portal/src/main/java/com/ctrip/framework/apollo/portal/controller/ItemController.java
View file @
eb6af6f0
...
@@ -88,7 +88,7 @@ public class ItemController {
...
@@ -88,7 +88,7 @@ public class ItemController {
@RequestParam
(
defaultValue
=
"lineNum"
)
String
orderBy
){
@RequestParam
(
defaultValue
=
"lineNum"
)
String
orderBy
){
List
<
ItemDTO
>
items
=
configService
.
findItems
(
appId
,
Env
.
valueOf
(
env
),
clusterName
,
namespaceName
);
List
<
ItemDTO
>
items
=
configService
.
findItems
(
appId
,
Env
.
valueOf
(
env
),
clusterName
,
namespaceName
);
if
(
"lastModif
y
Time"
.
equals
(
orderBy
)){
if
(
"lastModif
ied
Time"
.
equals
(
orderBy
)){
Collections
.
sort
(
items
,
(
o1
,
o2
)
->
{
Collections
.
sort
(
items
,
(
o1
,
o2
)
->
{
if
(
o1
.
getDataChangeLastModifiedTime
().
after
(
o2
.
getDataChangeLastModifiedTime
())){
if
(
o1
.
getDataChangeLastModifiedTime
().
after
(
o2
.
getDataChangeLastModifiedTime
())){
return
-
1
;
return
-
1
;
...
...
apollo-portal/src/main/resources/static/scripts/controller/config/SyncConfigController.js
View file @
eb6af6f0
...
@@ -16,7 +16,7 @@ sync_item_module.controller("SyncItemController",
...
@@ -16,7 +16,7 @@ sync_item_module.controller("SyncItemController",
ConfigService
.
find_items
(
$scope
.
pageContext
.
appId
,
$scope
.
pageContext
.
env
,
ConfigService
.
find_items
(
$scope
.
pageContext
.
appId
,
$scope
.
pageContext
.
env
,
$scope
.
pageContext
.
clusterName
,
$scope
.
pageContext
.
clusterName
,
$scope
.
pageContext
.
namespaceName
,
$scope
.
pageContext
.
namespaceName
,
"lastModif
y
Time"
)
"lastModif
ied
Time"
)
.
then
(
function
(
result
)
{
.
then
(
function
(
result
)
{
$scope
.
sourceItems
=
[];
$scope
.
sourceItems
=
[];
...
...
apollo-portal/src/main/resources/static/views/component/namespace-panel.html
View file @
eb6af6f0
<div
class=
"panel"
style=
"border-top: 0px;"
>
<div
class=
"panel"
style=
"border-top: 0px;"
>
<div
class=
"row namespace-attribute-panel"
ng-if=
"namespace.isPublic"
>
<div
class=
"row namespace-attribute-panel"
ng-if=
"namespace.isPublic"
>
<div
class=
"text-center namespace-attribute-public"
data-tooltip=
"tooltip"
data-placement=
"bottom"
<div
class=
"text-center namespace-attribute-public"
>
title=
"点击跳转到公共Namespace"
>
<span
data-tooltip=
"tooltip"
data-placement=
"bottom"
title=
"公共的Namespace"
<span
ng-show=
"namespace.parentAppId == namespace.baseInfo.appId"
>
公共
</span>
ng-show=
"namespace.parentAppId == namespace.baseInfo.appId"
>
公共
</span>
<span
ng-show=
"namespace.parentAppId != namespace.baseInfo.appId"
<span
data-tooltip=
"tooltip"
data-placement=
"bottom"
title=
"点击跳转到公共的Namespace"
ng-show=
"namespace.parentAppId != namespace.baseInfo.appId"
ng-click=
"goToParentAppConfigPage(namespace)"
>
关联
</span>
ng-click=
"goToParentAppConfigPage(namespace)"
>
关联
</span>
</div>
</div>
</div>
</div>
...
...
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