Merge pull-request #981

1 files changed, 22 insertions, 0 deletions

diff --git a/app/Integration/SlackWebhook.php b/app/Integration/SlackWebhook.php
index 975ea21f..a584c132 100644
--- a/app/Integration/SlackWebhook.php
+++ b/app/Integration/SlackWebhook.php
@@ -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);
         }