mirror of
https://github.com/cuigh/swirl
synced 2025-06-26 18:16:50 +00:00
Add task list page
This commit is contained in:
@@ -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
|
||||
}
|
||||
|
||||
@@ -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
|
||||
}
|
||||
|
||||
@@ -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)
|
||||
|
||||
Reference in New Issue
Block a user