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
4c0a7548
Commit
4c0a7548
authored
Jun 23, 2016
by
lepdou
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
update
parent
ce97c549
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
5 additions
and
7 deletions
+5
-7
CommitController.java
.../framework/apollo/portal/controller/CommitController.java
+2
-4
config.html
apollo-portal/src/main/resources/static/config.html
+2
-2
ConfigNamespaceController.js
...tatic/scripts/controller/app/ConfigNamespaceController.js
+1
-1
No files found.
apollo-portal/src/main/java/com/ctrip/framework/apollo/portal/controller/CommitController.java
View file @
4c0a7548
...
...
@@ -16,21 +16,19 @@ import java.util.List;
@RestController
public
class
CommitController
{
private
final
static
int
COMMIT_HISTORY_PAGE_SIZE
=
10
;
@Autowired
private
CommitService
commitService
;
@RequestMapping
(
value
=
"/apps/{appId}/envs/{env}/clusters/{clusterName}/namespaces/{namespaceName}/commits"
)
public
List
<
CommitDTO
>
find
(
@PathVariable
String
appId
,
@PathVariable
String
env
,
@PathVariable
String
clusterName
,
@PathVariable
String
namespaceName
,
@RequestParam
int
pag
e
){
@RequestParam
(
defaultValue
=
"0"
)
int
page
,
@RequestParam
(
defaultValue
=
"10"
)
int
siz
e
){
if
(
page
<
0
){
page
=
0
;
}
return
commitService
.
find
(
appId
,
Env
.
valueOf
(
env
),
clusterName
,
namespaceName
,
page
,
COMMIT_HISTORY_PAGE_SIZE
);
return
commitService
.
find
(
appId
,
Env
.
valueOf
(
env
),
clusterName
,
namespaceName
,
page
,
size
);
}
...
...
apollo-portal/src/main/resources/static/config.html
View file @
4c0a7548
...
...
@@ -234,7 +234,7 @@
Key
</th>
<th>
v
alue
V
alue
</th>
<th>
备注
...
...
@@ -540,7 +540,7 @@
</label>
<div
class=
"col-sm-10"
>
<textarea
type=
"text"
class=
"form-control"
rows=
"6"
ng-model=
"item.value"
ng-required=
"true"
ng-show=
"tableViewOperType != 'retrieve'"
>
ng-show=
"tableViewOperType != 'retrieve'"
>
</textarea>
<p
ng-bind=
"item.value"
ng-show=
"tableViewOperType == 'retrieve'"
></p>
</div>
...
...
apollo-portal/src/main/resources/static/scripts/controller/app/ConfigNamespaceController.js
View file @
4c0a7548
...
...
@@ -110,7 +110,7 @@ application_module.controller("ConfigNamespaceController",
}
namespace
.
commitPage
+=
1
;
},
function
(
result
)
{
toastr
.
error
(
AppUtil
.
errorMsg
(
result
),
"加载
提交
历史记录出错"
);
toastr
.
error
(
AppUtil
.
errorMsg
(
result
),
"加载
修改
历史记录出错"
);
});
}
...
...
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