External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-05-08 01:47:35 -02:30
Code Issues Packages Projects Releases Wiki Activity

Adding a check to see if the color is 'None' before lowercasing it for @matburt

Browse Source
This commit is contained in:
Romain Brucker
2017-09-28 11:15:14 -05:00
parent e67549e4a1
commit 1bb72cc680
1 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
awx/main/notifications/hipchat_backend.py
View File

@@ -26,7 +26,10 @@ class HipChatBackend(AWXBaseEmailBackend):
def __init__(self, token, color, api_url, notify, fail_silently=False, **kwargs): def __init__(self, token, color, api_url, notify, fail_silently=False, **kwargs):
super(HipChatBackend, self).__init__(fail_silently=fail_silently) super(HipChatBackend, self).__init__(fail_silently=fail_silently)
self.token = token self.token = token
self.color = color if color == 'None':
self.color = color
else:
self.color = color.lower()
self.api_url = api_url self.api_url = api_url
self.notify = notify self.notify = notify
@@ -38,7 +41,7 @@ class HipChatBackend(AWXBaseEmailBackend):
r = requests.post("{}/v2/room/{}/notification".format(self.api_url, rcp), r = requests.post("{}/v2/room/{}/notification".format(self.api_url, rcp),
params={"auth_token": self.token}, params={"auth_token": self.token},
verify=False, verify=False,
json={"color": self.color.lower(), json={"color": self.color,
"message": m.subject, "message": m.subject,
"notify": self.notify, "notify": self.notify,
"from": m.from_email, "from": m.from_email,