red-future/ppgo_job
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修复任务列表查看权限的bug

Browse Source 
任务分组权限无法控制列表显示
This commit is contained in:
george518
2018-12-27 11:39:27 +08:00
parent 2d68c127bd
commit cce046b404
1 changed files with 3 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
controllers/task.go
View File

@@ -15,9 +15,9 @@ import (
"fmt" "fmt"
"github.com/astaxie/beego" "github.com/astaxie/beego"
"github.com/george518/PPGo_Job/crons"
"github.com/george518/PPGo_Job/jobs" "github.com/george518/PPGo_Job/jobs"
"github.com/george518/PPGo_Job/models" "github.com/george518/PPGo_Job/models"
"github.com/george518/PPGo_Job/crons"
) )
type TaskController struct { type TaskController struct {
@@ -247,7 +247,7 @@ func (self *TaskController) AjaxSave() {
if !isBan { if !isBan {
self.ajaxMsg("含有禁止命令："+msg, MSG_ERR) self.ajaxMsg("含有禁止命令："+msg, MSG_ERR)
} }
if _, err := cron.Parse(task.CronSpec); err != nil { if _, err := cron.Parse(task.CronSpec); err != nil {
self.ajaxMsg("cron表达式无效", MSG_ERR) self.ajaxMsg("cron表达式无效", MSG_ERR)
} }
@@ -498,7 +498,7 @@ func (self *TaskController) Table() {
limit = 30 limit = 30
} }
groupId, _ := self.GetInt("group_id", -1) groupId, _ := self.GetInt("group_id", 0)
//0-全部，-1如果存在，n,如果不存在，0 //0-全部，-1如果存在，n,如果不存在，0
@@ -515,7 +515,6 @@ func (self *TaskController) Table() {
//} //}
status, _ := self.GetInt("status") status, _ := self.GetInt("status")
taskName := strings.TrimSpace(self.GetString("task_name")) taskName := strings.TrimSpace(self.GetString("task_name"))
StatusText := []string{ StatusText := []string{
@@ -542,7 +541,6 @@ func (self *TaskController) Table() {
if groupId == 0 { if groupId == 0 {
if self.userId != 1 { if self.userId != 1 {
groups := strings.Split(self.taskGroups, ",") groups := strings.Split(self.taskGroups, ",")
groupsIds := make([]int, 0) groupsIds := make([]int, 0)
for _, v := range groups { for _, v := range groups {
id, _ := strconv.Atoi(v) id, _ := strconv.Atoi(v)
@@ -557,8 +555,6 @@ func (self *TaskController) Table() {
filters = append(filters, "task_name__icontains", taskName) filters = append(filters, "task_name__icontains", taskName)
} }
//fmt.Println(filters, "----------", taskName)
result, count := models.TaskGetList(page, self.pageSize, filters...) result, count := models.TaskGetList(page, self.pageSize, filters...)
list := make([]map[string]interface{}, len(result)) list := make([]map[string]interface{}, len(result))