Improve automatic action to create comments based on commit messages
This commit is contained in:
@@ -3,7 +3,6 @@
|
||||
namespace Integration;
|
||||
|
||||
use Event\GenericEvent;
|
||||
use Event\TaskEvent;
|
||||
use Model\Task;
|
||||
|
||||
/**
|
||||
@@ -116,7 +115,7 @@ class GitlabWebhook extends \Core\Base
|
||||
{
|
||||
$task_id = $this->task->getTaskIdFromText($commit['message']);
|
||||
|
||||
if (! $task_id) {
|
||||
if (empty($task_id)) {
|
||||
return false;
|
||||
}
|
||||
|
||||
@@ -126,17 +125,21 @@ class GitlabWebhook extends \Core\Base
|
||||
return false;
|
||||
}
|
||||
|
||||
if ($task['is_active'] == Task::STATUS_OPEN && $task['project_id'] == $this->project_id) {
|
||||
|
||||
$this->container['dispatcher']->dispatch(
|
||||
self::EVENT_COMMIT,
|
||||
new TaskEvent(array('task_id' => $task_id) + $task)
|
||||
);
|
||||
|
||||
return true;
|
||||
if ($task['project_id'] != $this->project_id) {
|
||||
return false;
|
||||
}
|
||||
|
||||
return false;
|
||||
$this->container['dispatcher']->dispatch(
|
||||
self::EVENT_COMMIT,
|
||||
new GenericEvent(array(
|
||||
'task_id' => $task_id,
|
||||
'commit_message' => $commit['message'],
|
||||
'commit_url' => $commit['url'],
|
||||
'commit_comment' => $commit['message']."\n\n[".t('Commit made by @%s on Gitlab', $commit['author']['name']).']('.$commit['url'].')'
|
||||
) + $task)
|
||||
);
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
/**
|
||||
|
||||
Reference in New Issue
Block a user