shaba/awx
1
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2024-11-02 09:51:09 +03:00
Code Releases Activity

Fix up notification related unicode errors

Browse Source 
I'm not sure why I used smart_text instead of smart_str here originally
This commit is contained in:
Matthew Jones 2016-05-12 10:53:38 -04:00
parent 76728fcba7
commit 1faf3cceb8
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
awx/main/tasks.py
View File

@ -38,7 +38,7 @@ from celery import Task, task
from django.conf import settings from django.conf import settings
from django.db import transaction, DatabaseError from django.db import transaction, DatabaseError
from django.utils.timezone import now from django.utils.timezone import now
from django.utils.encoding import smart_text from django.utils.encoding import smart_str
from django.core.mail import send_mail from django.core.mail import send_mail
from django.contrib.auth.models import User from django.contrib.auth.models import User
@ -82,7 +82,7 @@ def send_notifications(notification_list, job_id=None):
except Exception as e: except Exception as e:
logger.error("Send Notification Failed {}".format(e)) logger.error("Send Notification Failed {}".format(e))
notification.status = "failed" notification.status = "failed"
notification.error = smart_text(e) notification.error = smart_str(e)
finally: finally:
notification.save() notification.save()
if job_id is not None: if job_id is not None:
@ -211,7 +211,7 @@ def handle_work_success(self, result, task_actual):
notification_body = instance.notification_data() notification_body = instance.notification_data()
notification_subject = "{} #{} '{}' succeeded on Ansible Tower: {}".format(friendly_name, notification_subject = "{} #{} '{}' succeeded on Ansible Tower: {}".format(friendly_name,
task_actual['id'], task_actual['id'],
smart_text(instance_name), smart_str(instance_name),
notification_body['url']) notification_body['url'])
notification_body['friendly_name'] = friendly_name notification_body['friendly_name'] = friendly_name
send_notifications.delay([n.generate_notification(notification_subject, notification_body).id send_notifications.delay([n.generate_notification(notification_subject, notification_body).id
@ -273,7 +273,7 @@ def handle_work_error(self, task_id, subtasks=None):
notification_body = first_task.notification_data() notification_body = first_task.notification_data()
notification_subject = "{} #{} '{}' failed on Ansible Tower: {}".format(first_task_friendly_name, notification_subject = "{} #{} '{}' failed on Ansible Tower: {}".format(first_task_friendly_name,
first_task_id, first_task_id,
smart_text(first_task_name), smart_str(first_task_name),
notification_body['url']) notification_body['url'])
notification_body['friendly_name'] = first_task_friendly_name notification_body['friendly_name'] = first_task_friendly_name
send_notifications.delay([n.generate_notification(notification_subject, notification_body).id send_notifications.delay([n.generate_notification(notification_subject, notification_body).id