github
/
Cloudreve
mirror of https://github.com/cloudreve/Cloudreve
1
0
Fork 0
Code Issues Releases Wiki Activity

feat(dashboard): admin can now view task detailed steps

pull/2224/merge
Aaron Liu 2025-05-20 10:45:50 +08:00
parent a10a008ed7
commit 2fac086127
3 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
service/admin/response.go
View File

@ -30,6 +30,7 @@ type ListTaskResponse struct {
type GetTaskResponse struct { type GetTaskResponse struct {
*ent.Task *ent.Task
UserHashID string `json:"user_hash_id,omitempty"` UserHashID string `json:"user_hash_id,omitempty"`
TaskHashID string `json:"task_hash_id,omitempty"`
Summary *queue.Summary `json:"summary,omitempty"` Summary *queue.Summary `json:"summary,omitempty"`
Node *ent.Node `json:"node,omitempty"` Node *ent.Node `json:"node,omitempty"`
} }

2
service/admin/task.go
View File

@ -178,6 +178,7 @@ func (s *AdminListService) Tasks(c *gin.Context) (*ListTaskResponse, error) {
return GetTaskResponse{ return GetTaskResponse{
Task: task, Task: task,
TaskHashID: hashid.EncodeTaskID(hasher, task.ID),
UserHashID: uid, UserHashID: uid,
Node: node, Node: node,
Summary: summary, Summary: summary,
@ -228,6 +229,7 @@ func (s *SingleTaskService) Get(c *gin.Context) (*GetTaskResponse, error) {
Summary: summary, Summary: summary,
Node: node, Node: node,
UserHashID: userHashID, UserHashID: userHashID,
TaskHashID: hashid.EncodeTaskID(hasher, task.ID),
}, nil }, nil
} }

2
service/explorer/workflows.go
View File

@ -386,7 +386,7 @@ func TaskPhaseProgress(c *gin.Context, taskID int) (queue.Progresses, error) {
u := inventory.UserFromContext(c) u := inventory.UserFromContext(c)
r := dep.TaskRegistry() r := dep.TaskRegistry()
t, found := r.Get(taskID) t, found := r.Get(taskID)
if !found || t.Owner().ID != u.ID { if !found || (t.Owner().ID != u.ID && !u.Edges.Group.Permissions.Enabled(int(types.GroupPermissionIsAdmin))) {
return queue.Progresses{}, nil return queue.Progresses{}, nil
} }