From d2c8e5d367f912c34a0f56594b67dae3d87d5571 Mon Sep 17 00:00:00 2001 From: caoyanyi Date: Wed, 3 Jan 2024 16:01:20 +0800 Subject: [PATCH] * Adjust action history replace. --- module/action/model.php | 35 ++++++++++++----------------------- 1 file changed, 12 insertions(+), 23 deletions(-) diff --git a/module/action/model.php b/module/action/model.php index 7e56dd33e5..94ff20f493 100755 --- a/module/action/model.php +++ b/module/action/model.php @@ -652,29 +652,7 @@ class actionModel extends model $action->history = isset($histories[$actionID]) ? $histories[$actionID] : array(); $actionName = strtolower($action->action); - if($actionName == 'svncommited') - { - foreach($action->history as $history) - { - if($history->field == 'subversion') - { - $history->diff = str_replace('+', '%2B', $history->diff); - $history->diff = str_replace("class='iframe'", "class='iframe' data-height='500'", $history->diff); - } - } - } - elseif($actionName == 'gitcommited') - { - foreach($action->history as $history) - { - if($history->field == 'git') - { - $history->diff = str_replace('+', '%2B', $history->diff); - $history->diff = str_replace("class='iframe'", "class='iframe' data-height='500'", $history->diff); - } - } - } - elseif(strpos(',linkstory,unlinkstory,createchildrenstory,linkur,unlinkur,', ",$actionName,") !== false) + if(strpos(',linkstory,unlinkstory,createchildrenstory,linkur,unlinkur,', ",$actionName,") !== false) { $extra = ''; foreach(explode(',', $action->extra) as $id) $extra .= common::hasPriv('story', 'view') ? html::a(helper::createLink('story', 'view', "storyID=$id"), "#$id ") . ', ' : "#$id, "; @@ -691,6 +669,17 @@ class actionModel extends model $action->extra = str_replace("class='iframe'", 'data-app="devops"', $action->extra); } + foreach($action->history as $history) + { + if(empty($history->diff)) continue; + + if($history->field == 'git' || $history->field == 'subversion') + { + $history->diff = str_replace('+', '%2B', $history->diff); + $history->diff = str_replace("class='iframe'", "class='iframe' data-height='500'", $history->diff); + } + } + $action->comment = $this->file->setImgSize($action->comment, $this->config->action->commonImgSize); $actions[$actionID] = $action;