Merge pull request #1 from fguillot/master

Update from upstream

1 files changed, 15 insertions, 15 deletions

diff --git a/app/Action/CommentCreation.php b/app/Action/CommentCreation.php
index 73fedc3b..b91e39e2 100644
--- a/app/Action/CommentCreation.php
+++ b/app/Action/CommentCreation.php
@@ -2,10 +2,6 @@
 
 namespace Kanboard\Action;
 
-use Kanboard\Integration\BitbucketWebhook;
-use Kanboard\Integration\GithubWebhook;
-use Kanboard\Integration\GitlabWebhook;
-
 /**
  * Create automatically a comment from a webhook
  *
@@ -15,6 +11,17 @@ use Kanboard\Integration\GitlabWebhook;
 class CommentCreation extends Base
 {
     /**
+     * Get automatic action description
+     *
+     * @access public
+     * @return string
+     */
+    public function getDescription()
+    {
+        return t('Create a comment from an external provider');
+    }
+
+    /**
      * Get the list of compatible events
      *
      * @access public
@@ -22,14 +29,7 @@ class CommentCreation extends Base
      */
     public function getCompatibleEvents()
     {
-        return array(
-            GithubWebhook::EVENT_ISSUE_COMMENT,
-            GithubWebhook::EVENT_COMMIT,
-            BitbucketWebhook::EVENT_ISSUE_COMMENT,
-            BitbucketWebhook::EVENT_COMMIT,
-            GitlabWebhook::EVENT_COMMIT,
-            GitlabWebhook::EVENT_ISSUE_COMMENT,
-        );
+        return array();
     }
 
     /**
@@ -67,9 +67,9 @@ class CommentCreation extends Base
     {
         return (bool) $this->comment->create(array(
             'reference' => isset($data['reference']) ? $data['reference'] : '',
-            'comment' => empty($data['comment']) ? $data['commit_comment'] : $data['comment'],
+            'comment' => $data['comment'],
             'task_id' => $data['task_id'],
-            'user_id' => empty($data['user_id']) ? 0 : $data['user_id'],
+            'user_id' => isset($data['user_id']) && $this->projectPermission->isAssignable($this->getProjectId(), $data['user_id']) ? $data['user_id'] : 0,
         ));
     }
 
@@ -82,6 +82,6 @@ class CommentCreation extends Base
      */
     public function hasRequiredCondition(array $data)
     {
-        return ! empty($data['comment']) || ! empty($data['commit_comment']);
+        return ! empty($data['comment']);
     }
 }