diff --git a/controllers/task.go b/controllers/task.go index 1469e60..18569fe 100644 --- a/controllers/task.go +++ b/controllers/task.go @@ -195,6 +195,15 @@ func (self *TaskController) Detail() { self.Data["CreateName"] = createName self.Data["UpdateName"] = updateName self.Data["serverName"] = serverName + + self.Data["NotifyTplName"] = "未知" + if task.IsNotify == 1 { + notifyTpl, err := models.NotifyTplGetById(task.NotifyTplId) + if err == nil { + self.Data["NotifyTplName"] = notifyTpl.TplName + } + } + self.display() } diff --git a/controllers/task_log.go b/controllers/task_log.go index 3fbe064..52460af 100644 --- a/controllers/task_log.go +++ b/controllers/task_log.go @@ -146,15 +146,6 @@ func (self *TaskLogController) Detail() { self.Data["CreateTime"] = beego.Date(time.Unix(task.CreateTime, 0), "Y-m-d H:i:s") self.Data["UpdateTime"] = beego.Date(time.Unix(task.UpdateTime, 0), "Y-m-d H:i:s") self.Data["task"] = task - - self.Data["NotifyTplName"] = "未知" - if task.IsNotify == 1 { - notifyTpl, err := models.NotifyTplGetById(task.NotifyTplId) - if err == nil { - self.Data["NotifyTplName"] = notifyTpl.TplName - } - } - // 分组列表 self.Data["taskGroup"] = taskGroupLists(self.taskGroups, self.userId) @@ -204,6 +195,15 @@ func (self *TaskLogController) Detail() { self.Data["CreateName"] = createName self.Data["UpdateName"] = updateName self.Data["pageTitle"] = "日志详细" + "(#" + strconv.Itoa(id) + ")" + + self.Data["NotifyTplName"] = "未知" + if task.IsNotify == 1 { + notifyTpl, err := models.NotifyTplGetById(task.NotifyTplId) + if err == nil { + self.Data["NotifyTplName"] = notifyTpl.TplName + } + } + self.display() } diff --git a/views/task/detail.html b/views/task/detail.html index ad08e3d..c5659c1 100644 --- a/views/task/detail.html +++ b/views/task/detail.html @@ -103,6 +103,12 @@ + + 通知模板 + {{.NotifyTplName}} + + + 通知用户