tyler.durden/icingaweb2-module-director
1
0
Fork 0
mirror of https://github.com/Icinga/icingaweb2-module-director.git synced 2025-08-14 14:28:10 +02:00
Code Issues Packages Projects Releases Wiki Activity

BranchMerger: no remark with empty comment

Browse Source
This commit is contained in:
Thomas Gelf 2022-02-08 08:57:58 +01:00
parent 8bcc20e004
commit bb567946d2
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
library/Director/Db/Branch/BranchMerger.php
View File

@ -101,11 +101,13 @@ class BranchMerger
$firstActivityId = (int) $this->db->fetchOne(
$this->db->select()->from('director_activity_log', 'MIN(id)')->where('id > ?', $formerActivityId)
);
$this->db->insert('director_activity_log_remark', [
'first_related_activity' => $firstActivityId,
'last_related_activity' => $currentActivityId,
'remark' => $comment,
]);
if ($comment && strlen($comment)) {
$this->db->insert('director_activity_log_remark', [
'first_related_activity' => $firstActivityId,
'last_related_activity' => $currentActivityId,
'remark' => $comment,
]);
}
});
}