Design/EasySoft-ZenTaoPMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 30 Wiki Activity

Merge branch 'zentaopms_279_bug#31190' into 'master'

Browse Source 
* Fix bug #31190.

See merge request easycorp/zentaopms!6636
This commit is contained in:
王怡栋
2022-12-27 01:30:51 +00:00
parent 9e13bd16c3 770881fd4f
commit 0692155514
5 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/webhook/lang/de.php
+1
View File
@@ -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';
module/webhook/lang/en.php
+1
View File
@@ -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';
module/webhook/lang/fr.php
+1
View File
@@ -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';
module/webhook/lang/zh-cn.php
+1
View File
@@ -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'] = '钉钉群通知机器人';
module/webhook/view/log.html.php
+6 -2
View File
@@ -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>