taiga
/
taiga-back
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[Backport] Fixing commit webhooks

remotes/origin/issue/4217/improving-mail-design
Alejandro Alonso 2016-10-11 07:36:17 +02:00
parent a9d46c2bea
commit 67e2ec6905
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
taiga/hooks/gitlab/event_hooks.py
View File

@ -40,7 +40,7 @@ class IssuesEventHook(BaseGitLabEventHook, BaseNewIssueEventHook):
def get_data(self):
description = self.payload.get('object_attributes', {}).get('description', None)
project_url = self.payload.get('repository', {}).get('homepage', None)
project_url = self.payload.get('repository', {}).get('homepage', "")
user_name = self.payload.get('user', {}).get('username', None)
return {
"number": self.payload.get('object_attributes', {}).get('iid', None),
@ -59,7 +59,7 @@ class IssueCommentEventHook(BaseGitLabEventHook, BaseIssueCommentEventHook):
def get_data(self):
comment_message = self.payload.get('object_attributes', {}).get('note', None)
project_url = self.payload.get('repository', {}).get('homepage', None)
project_url = self.payload.get('repository', {}).get('homepage', "")
number = self.payload.get('issue', {}).get('iid', None)
user_name = self.payload.get('user', {}).get('username', None)
return {

4
taiga/hooks/gogs/event_hooks.py
View File

@ -37,10 +37,10 @@ class PushEventHook(BaseGogsEventHook, BasePushEventHook):
def get_data(self):
result = []
commits = self.payload.get("commits", [])
project_url = self.payload.get("repository", {}).get("html_url", None)
project_url = self.payload.get("repository", {}).get("html_url", "")
for commit in filter(None, commits):
user_name = commit.get('author', {}).get('username', None)
user_name = commit.get('author', {}).get('username', "")
result.append({
"user_id": user_name,
"user_name": user_name,