Commit a8af467f by zhangle

update

parent 847b949b
......@@ -31,8 +31,8 @@ public class InstanceController {
private InstanceService instanceService;
@RequestMapping("/envs/{env}/instances/by-release")
public PageDTO getByRelease(@PathVariable String env, @RequestParam long releaseId,
@RequestParam int page, @RequestParam(defaultValue = "20") int size) {
public PageDTO<InstanceDTO> getByRelease(@PathVariable String env, @RequestParam long releaseId,
@RequestParam(defaultValue = "0") int page, @RequestParam(defaultValue = "20") int size) {
return instanceService.getByRelease(Env.valueOf(env), releaseId, page, size);
}
......@@ -40,7 +40,7 @@ public class InstanceController {
@RequestMapping("/envs/{env}/instances/by-namespace")
public PageDTO<InstanceDTO> getByNamespace(@PathVariable String env, @RequestParam String appId,
@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);
}
......
......@@ -63,7 +63,7 @@
<header class="panel-heading second-panel-heading">
<div class="row">
<div class="col-md-6 pull-left">
<div class="col-md-8 pull-left">
<ul class="nav nav-tabs">
<li role="presentation" ng-click="switchView(namespace, 'table')"
ng-show="namespace.isPropertiesFormat">
......@@ -93,7 +93,7 @@
</li>
</ul>
</div>
<div class="col-md-6 text-right">
<div class="col-md-4 text-right">
<a data-tooltip="tooltip" data-placement="bottom" title="取消修改"
ng-show="namespace.isTextEditing && namespace.viewType == 'text'"
ng-click="toggleTextEditStatus(namespace)">
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment