External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-03-07 11:41:08 -03:30
Code Issues Packages Projects Releases Wiki Activity

Fix some notifications issues and write some tests

Browse Source 
* Fixes some notifier merging issues
* Fixes some more unicode problems
* Implements unit tests
This commit is contained in:
Matthew Jones
2016-02-29 12:30:00 -05:00
parent b35d7a3c6b
commit 0ee12901fe
8 changed files with 302 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
awx/main/models/inventory.py
View File

@@ -1185,11 +1185,10 @@ class InventorySource(UnifiedJobTemplate, InventorySourceOptions):
@property
def notifiers(self):
# Return all notifiers defined on the Project, and on the Organization for each trigger type
base_notifiers = Notifier.objects.filter(active=True)
error_notifiers = list(base_notifiers.filter(organization_notifiers_for_errors__in=[self]))
success_notifiers = list(base_notifiers.filter(organization_notifiers_for_success__in=[self]))
any_notifiers = list(base_notifiers.filter(organization_notifiers_for_any__in=[self]))
error_notifiers = list(base_notifiers.filter(organization_notifiers_for_errors=self.inventory.organization))
success_notifiers = list(base_notifiers.filter(organization_notifiers_for_success=self.inventory.organization))
any_notifiers = list(base_notifiers.filter(organization_notifiers_for_any=self.inventory.organization))
return dict(error=error_notifiers, success=success_notifiers, any=any_notifiers)
def clean_source(self):