From 3657ea6fb08ff1a49f0a672010baaccd521032b4 Mon Sep 17 00:00:00 2001
From: linxiaozhi <linxiaozhi@linxiaozhi.com>
Date: Sat, 16 Feb 2019 23:25:38 +0800
Subject: [PATCH] =?UTF-8?q?=20=E4=BB=BB=E5=8A=A1=E7=AE=A1=E7=90=86-?=
 =?UTF-8?q?=E8=AF=A6=E6=83=85=E6=98=BE=E7=A4=BA=E9=80=9A=E7=9F=A5=E6=A8=A1?=
 =?UTF-8?q?=E6=9D=BF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 controllers/task.go     |  9 +++++++++
 controllers/task_log.go | 18 +++++++++---------
 views/task/detail.html  |  6 ++++++
 3 files changed, 24 insertions(+), 9 deletions(-)

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 @@
                 <td></td>
             </tr>
 
+            <tr>
+                <td>通知模板</td>
+                <td>{{.NotifyTplName}}</td>
+                <td></td>
+            </tr>
+
             <tr>
                 <td>通知用户</td>
                 <td>