Add task list page

This commit is contained in:
cuigh
2017-10-19 20:40:05 +08:00
parent e862737699
commit 6d820149cf
14 changed files with 185 additions and 60 deletions

View File

@@ -52,7 +52,7 @@ func nodeDetail(ctx web.Context) error {
return err
}
tasks, err := docker.TaskList("", id)
tasks, _, err := docker.TaskList(&model.TaskListArgs{Node: id})
if err != nil {
return err
}

View File

@@ -75,7 +75,7 @@ func serviceDetail(ctx web.Context) error {
info.Networks = append(info.Networks, model.Network{ID: vip.NetworkID, Name: n.Name, Address: vip.Addr})
}
tasks, err := docker.TaskList(name, "")
tasks, _, err := docker.TaskList(&model.TaskListArgs{Service: name})
if err != nil {
return err
}

View File

@@ -4,10 +4,12 @@ import (
"github.com/cuigh/auxo/net/web"
"github.com/cuigh/swirl/biz/docker"
"github.com/cuigh/swirl/misc"
"github.com/cuigh/swirl/model"
)
// TaskController is a controller of swarm task
type TaskController struct {
List web.HandlerFunc `path:"/" name:"task.list" authorize:"!" desc:"task list page"`
Detail web.HandlerFunc `path:"/:id/detail" name:"task.detail" authorize:"!" desc:"task detail page"`
Raw web.HandlerFunc `path:"/:id/raw" name:"task.raw" authorize:"!" desc:"task raw page"`
}
@@ -15,11 +17,34 @@ type TaskController struct {
// Task creates an instance of TaskController
func Task() (c *TaskController) {
return &TaskController{
List: taskList,
Detail: taskDetail,
Raw: taskRaw,
}
}
func taskList(ctx web.Context) error {
args := &model.TaskListArgs{}
err := ctx.Bind(args)
if err != nil {
return err
}
args.PageSize = model.PageSize
if args.PageIndex == 0 {
args.PageIndex = 1
}
tasks, totalCount, err := docker.TaskList(args)
if err != nil {
return err
}
m := newPagerModel(ctx, totalCount, args.PageSize, args.PageIndex).
Add("Args", args).
Add("Tasks", tasks)
return ctx.Render("task/list", m)
}
func taskDetail(ctx web.Context) error {
id := ctx.P("id")
task, _, err := docker.TaskInspect(id)