From 770881fd4fc48f6f9ab249318efedf3af7a48b56 Mon Sep 17 00:00:00 2001
From: wangyuting <851424971@qq.com>
Date: Tue, 27 Dec 2022 01:10:26 +0000
Subject: [PATCH] * Fix bug #31190.

---
 module/webhook/lang/de.php       | 1 +
 module/webhook/lang/en.php       | 1 +
 module/webhook/lang/fr.php       | 1 +
 module/webhook/lang/zh-cn.php    | 1 +
 module/webhook/view/log.html.php | 8 ++++++--
 5 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/module/webhook/lang/de.php b/module/webhook/lang/de.php
index e9005798bc..8f056938dc 100644
--- a/module/webhook/lang/de.php
+++ b/module/webhook/lang/de.php
@@ -40,6 +40,7 @@ $lang->webhook->products    = $lang->productCommon;
 $lang->webhook->executions  = $lang->execution->common;
 $lang->webhook->actions     = 'Log';
 $lang->webhook->deleted     = 'Deleted';
+$lang->webhook->approval    = 'Approval send message';
 
 $lang->webhook->typeList['']            = '';
 $lang->webhook->typeList['dinggroup']   = 'Dingding Robot';
diff --git a/module/webhook/lang/en.php b/module/webhook/lang/en.php
index b27e1d8a27..dcbb6f4ec4 100644
--- a/module/webhook/lang/en.php
+++ b/module/webhook/lang/en.php
@@ -40,6 +40,7 @@ $lang->webhook->products    = $lang->productCommon;
 $lang->webhook->executions  = $lang->execution->common;
 $lang->webhook->actions     = 'Log';
 $lang->webhook->deleted     = 'Deleted';
+$lang->webhook->approval    = 'Approval send message';
 
 $lang->webhook->typeList['']            = '';
 $lang->webhook->typeList['dinggroup']   = 'Dingding Robot';
diff --git a/module/webhook/lang/fr.php b/module/webhook/lang/fr.php
index 9ede256115..6555166e1f 100644
--- a/module/webhook/lang/fr.php
+++ b/module/webhook/lang/fr.php
@@ -40,6 +40,7 @@ $lang->webhook->products    = $lang->productCommon;
 $lang->webhook->executions  = $lang->execution->common;
 $lang->webhook->actions     = 'Log';
 $lang->webhook->deleted     = 'Deleted';
+$lang->webhook->approval    = 'Approval send message';
 
 $lang->webhook->typeList['']            = '';
 $lang->webhook->typeList['dinggroup']   = 'Dingding Robot';
diff --git a/module/webhook/lang/zh-cn.php b/module/webhook/lang/zh-cn.php
index 5cab898873..f0356b8743 100644
--- a/module/webhook/lang/zh-cn.php
+++ b/module/webhook/lang/zh-cn.php
@@ -40,6 +40,7 @@ $lang->webhook->products    = $lang->productCommon;
 $lang->webhook->executions  = $lang->execution->common;
 $lang->webhook->actions     = '系统日志';
 $lang->webhook->deleted     = '已删除';
+$lang->webhook->approval    = '审批流推送';
 
 $lang->webhook->typeList['']            = '';
 $lang->webhook->typeList['dinggroup']   = '钉钉群通知机器人';
diff --git a/module/webhook/view/log.html.php b/module/webhook/view/log.html.php
index 7a9569a729..149f61ac3c 100644
--- a/module/webhook/view/log.html.php
+++ b/module/webhook/view/log.html.php
@@ -44,9 +44,13 @@
         <td class='text-center'><?php echo $id;?></td>
         <td><?php echo $log->date;?></td>
         <td title='<?php echo $log->url;?>'><?php echo $log->url;?></td>
-        <?php $iframe = $log->dialog == 1 ? 'data-toggle="modal" data-type="iframe"' : '';?>
-        <?php if($log->dialog == 1) $log->actionURL = $this->createLink($log->module, 'view', "id=$log->moduleID", '' , true)?>
+        <?php $iframe = zget($log, 'dialog', 0) == 1 ? 'data-toggle="modal" data-type="iframe"' : '';?>
+        <?php if(zget($log, 'dialog', 0) == 1) $log->actionURL = $this->createLink($log->module, 'view', "id=$log->moduleID", '' , true)?>
+        <?php if($log->action):?>
         <td title='<?php echo $log->action;?>'><?php echo html::a($log->actionURL, $log->action, '', $iframe);?></td>
+        <?php else:?>
+        <td title='<?php echo $lang->webhook->approval;?>'><?php echo $lang->webhook->approval;?></td>
+        <?php endif;?>
         <td title='<?php echo $log->contentType;?>'><?php echo $log->contentType;?></td>
         <td title='<?php echo $log->result;?>'><?php echo $log->result;?></td>
       </tr>