AS1024/Kanboard-Prod
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull-request #981

Browse Source
This commit is contained in:
Frederic Guillot
2015-07-05 12:52:44 -04:00
parent 0de2690413 bc6b443c3d
commit aa2ca3342d
4 changed files with 37 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
app/Integration/SlackWebhook.php
View File

@@ -38,6 +38,23 @@ class SlackWebhook extends \Core\Base
$options = $this->projectIntegration->getParameters($project_id);
return $options['slack_webhook_url'];
}
/**
* Get optional Slack channel
*
* @access public
* @param integer $project_id
* @return string
*/
public function getChannel($project_id)
{
if (!empty($this->config->get('integration_slack_webhook_channel'))) {
return $this->config->get('integration_slack_webhook_channel');
}
$options = $this->projectIntegration->getParameters($project_id);
return $options['slack_webhook_channel'];
}
/**
* Send message to the incoming Slack webhook
@@ -68,6 +85,11 @@ class SlackWebhook extends \Core\Base
$payload['text'] .= $this->helper->url->href('task', 'show', array('task_id' => $task_id, 'project_id' => $project_id));
$payload['text'] .= '|'.t('view the task on Kanboard').'>';
}
$channel = $this->getChannel($project_id);
if (!empty($channel)) {
$payload['channel'] = $channel;
}
$this->httpClient->postJson($this->getWebhookUrl($project_id), $payload);
}

2
app/Template/config/integrations.php
View File

@@ -77,6 +77,8 @@
<?= $this->form->label(t('Webhook URL'), 'integration_slack_webhook_url') ?>
<?= $this->form->text('integration_slack_webhook_url', $values, $errors) ?>
<?= $this->form->label(t('Channel/Group/User (Optional)'), 'integration_slack_webhook_channel') ?>
<?= $this->form->text('integration_slack_webhook_channel', $values, $errors) ?>
<p class="form-help"><a href="http://kanboard.net/documentation/slack" target="_blank"><?= t('Help on Slack integration') ?></a></p>
</div>

2
app/Template/project/integrations.php
View File

@@ -85,6 +85,8 @@
<?= $this->form->label(t('Webhook URL'), 'slack_webhook_url') ?>
<?= $this->form->text('slack_webhook_url', $values, $errors) ?>
<?= $this->form->label(t('Channel/Group/User (Optional)'), 'slack_webhook_channel') ?>
<?= $this->form->text('slack_webhook_channel', $values, $errors) ?>
<p class="form-help"><a href="http://kanboard.net/documentation/slack" target="_blank"><?= t('Help on Slack integration') ?></a></p>