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
a8af467f
Commit
a8af467f
authored
Aug 31, 2016
by
zhangle
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
update
parent
847b949b
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
5 additions
and
5 deletions
+5
-5
InstanceController.java
...ramework/apollo/portal/controller/InstanceController.java
+3
-3
namespace-panel.html
...ain/resources/static/views/component/namespace-panel.html
+2
-2
No files found.
apollo-portal/src/main/java/com/ctrip/framework/apollo/portal/controller/InstanceController.java
View file @
a8af467f
...
@@ -31,8 +31,8 @@ public class InstanceController {
...
@@ -31,8 +31,8 @@ public class InstanceController {
private
InstanceService
instanceService
;
private
InstanceService
instanceService
;
@RequestMapping
(
"/envs/{env}/instances/by-release"
)
@RequestMapping
(
"/envs/{env}/instances/by-release"
)
public
PageDTO
getByRelease
(
@PathVariable
String
env
,
@RequestParam
long
releaseId
,
public
PageDTO
<
InstanceDTO
>
getByRelease
(
@PathVariable
String
env
,
@RequestParam
long
releaseId
,
@RequestParam
int
page
,
@RequestParam
(
defaultValue
=
"20"
)
int
size
)
{
@RequestParam
(
defaultValue
=
"0"
)
int
page
,
@RequestParam
(
defaultValue
=
"20"
)
int
size
)
{
return
instanceService
.
getByRelease
(
Env
.
valueOf
(
env
),
releaseId
,
page
,
size
);
return
instanceService
.
getByRelease
(
Env
.
valueOf
(
env
),
releaseId
,
page
,
size
);
}
}
...
@@ -40,7 +40,7 @@ public class InstanceController {
...
@@ -40,7 +40,7 @@ public class InstanceController {
@RequestMapping
(
"/envs/{env}/instances/by-namespace"
)
@RequestMapping
(
"/envs/{env}/instances/by-namespace"
)
public
PageDTO
<
InstanceDTO
>
getByNamespace
(
@PathVariable
String
env
,
@RequestParam
String
appId
,
public
PageDTO
<
InstanceDTO
>
getByNamespace
(
@PathVariable
String
env
,
@RequestParam
String
appId
,
@RequestParam
String
clusterName
,
@RequestParam
String
namespaceName
,
@RequestParam
String
clusterName
,
@RequestParam
String
namespaceName
,
@RequestParam
int
page
,
@RequestParam
(
defaultValue
=
"20"
)
int
size
)
{
@RequestParam
(
defaultValue
=
"0"
)
int
page
,
@RequestParam
(
defaultValue
=
"20"
)
int
size
)
{
return
instanceService
.
getByNamespace
(
Env
.
valueOf
(
env
),
appId
,
clusterName
,
namespaceName
,
page
,
size
);
return
instanceService
.
getByNamespace
(
Env
.
valueOf
(
env
),
appId
,
clusterName
,
namespaceName
,
page
,
size
);
}
}
...
...
apollo-portal/src/main/resources/static/views/component/namespace-panel.html
View file @
a8af467f
...
@@ -63,7 +63,7 @@
...
@@ -63,7 +63,7 @@
<header
class=
"panel-heading second-panel-heading"
>
<header
class=
"panel-heading second-panel-heading"
>
<div
class=
"row"
>
<div
class=
"row"
>
<div
class=
"col-md-
6
pull-left"
>
<div
class=
"col-md-
8
pull-left"
>
<ul
class=
"nav nav-tabs"
>
<ul
class=
"nav nav-tabs"
>
<li
role=
"presentation"
ng-click=
"switchView(namespace, 'table')"
<li
role=
"presentation"
ng-click=
"switchView(namespace, 'table')"
ng-show=
"namespace.isPropertiesFormat"
>
ng-show=
"namespace.isPropertiesFormat"
>
...
@@ -93,7 +93,7 @@
...
@@ -93,7 +93,7 @@
</li>
</li>
</ul>
</ul>
</div>
</div>
<div
class=
"col-md-
6
text-right"
>
<div
class=
"col-md-
4
text-right"
>
<a
data-tooltip=
"tooltip"
data-placement=
"bottom"
title=
"取消修改"
<a
data-tooltip=
"tooltip"
data-placement=
"bottom"
title=
"取消修改"
ng-show=
"namespace.isTextEditing && namespace.viewType == 'text'"
ng-show=
"namespace.isTextEditing && namespace.viewType == 'text'"
ng-click=
"toggleTextEditStatus(namespace)"
>
ng-click=
"toggleTextEditStatus(namespace)"
>
...
...
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