From de1d605c289d4c50122e4ec665c411804fb4258e Mon Sep 17 00:00:00 2001
From: Jared Tabor <jtabor@ansible.com>
Date: Fri, 17 Jun 2016 17:09:55 -0700
Subject: [PATCH] fix for broken recent-notifications popover

---
 .../list.controller.js                        | 66 ++++++++++---------
 .../notificationTemplates.list.js             |  2 +-
 2 files changed, 35 insertions(+), 33 deletions(-)

diff --git a/awx/ui/client/src/notifications/notification-templates-list/list.controller.js b/awx/ui/client/src/notifications/notification-templates-list/list.controller.js
index edbd0cb42f..78a08c8839 100644
--- a/awx/ui/client/src/notifications/notification-templates-list/list.controller.js
+++ b/awx/ui/client/src/notifications/notification-templates-list/list.controller.js
@@ -109,41 +109,43 @@ export default
             }
 
             scope.showSummary = function(event, id) {
+                Wait('start');
+                setTimeout(function(){
+                    if (!Empty(id)) {
+                        var recent_notifications,
+                        html, title = "Recent Notifications";
 
-                if (!Empty(id)) {
-                    var recent_notifications,
-                    html, title = "Recent Notifications";
-
-                    scope.notification_templates.forEach(function(notification_template){
-                        if(notification_template.id === id){
-                            recent_notifications = notification_template.summary_fields.recent_notifications;
-                        }
-                    });
-                    Wait('stop');
-                    if (recent_notifications.length > 0) {
-                        html = "<table class=\"table table-condensed flyout\" style=\"width: 100%\">\n";
-                        html += "<thead>\n";
-                        html += "<tr>";
-                        html += "<th>Status</th>";
-                        html += "<th>Time</th>";
-                        html += "</tr>\n";
-                        html += "</thead>\n";
-                        html += "<tbody>\n";
-
-                        recent_notifications.forEach(function(row) {
-                            html += "<tr>\n";
-                            html += "<td><i class=\"fa icon-job-" + row.status + "\"></i></td>\n";
-                            html += "<td>" + ($filter('longDate')(row.created)).replace(/ /,'<br />') + "</td>\n";
-                            html += "</tr>\n";
+                        scope.notification_templates.forEach(function(notification_template){
+                            if(notification_template.id === id){
+                                recent_notifications = notification_template.summary_fields.recent_notifications;
+                            }
                         });
-                        html += "</tbody>\n";
-                        html += "</table>\n";
+                        Wait('stop');
+                        if (recent_notifications.length > 0) {
+                            html = "<table class=\"table table-condensed flyout\" style=\"width: 100%\">\n";
+                            html += "<thead>\n";
+                            html += "<tr>";
+                            html += "<th>Status</th>";
+                            html += "<th>Time</th>";
+                            html += "</tr>\n";
+                            html += "</thead>\n";
+                            html += "<tbody>\n";
+
+                            recent_notifications.forEach(function(row) {
+                                html += "<tr>\n";
+                                html += "<td><i class=\"fa icon-job-" + row.status + "\"></i></td>\n";
+                                html += "<td>" + ($filter('longDate')(row.created)).replace(/ /,'<br />') + "</td>\n";
+                                html += "</tr>\n";
+                            });
+                            html += "</tbody>\n";
+                            html += "</table>\n";
+                        }
+                        else {
+                            html = "<p>No recent notifications.</p>\n";
+                        }
+                        attachElem(event, html, title);
                     }
-                    else {
-                        html = "<p>No recent notifications.</p>\n";
-                    }
-                    attachElem(event, html, title);
-                }
+                }, 100);
             };
 
             scope.testNotification = function(){
diff --git a/awx/ui/client/src/notifications/notificationTemplates.list.js b/awx/ui/client/src/notifications/notificationTemplates.list.js
index f365112b4e..5046f4a192 100644
--- a/awx/ui/client/src/notifications/notificationTemplates.list.js
+++ b/awx/ui/client/src/notifications/notificationTemplates.list.js
@@ -27,7 +27,7 @@ export default function(){
                     icon: "{{ 'icon-job-' + notification_template.status }}",
                     awToolTip: "Click for recent notifications",
                     awTipPlacement: "right",
-                    ngClick: "showSummary($event, notification_templates.id)",
+                    ngClick: "showSummary($event, notification_template.id)",
                     ngClass: ""
                 }]
             },