From 3985e248bfce5c75f785a804a1e1a4936da80790 Mon Sep 17 00:00:00 2001
From: John Mitchell <jlmitch5@ncsu.edu>
Date: Fri, 22 Jan 2016 18:37:29 -0500
Subject: [PATCH] fixed indicator loading on incorrect row

---
 awx/ui/client/src/app.js | 31 +++++++++++++++++--------------
 1 file changed, 17 insertions(+), 14 deletions(-)

diff --git a/awx/ui/client/src/app.js b/awx/ui/client/src/app.js
index f407aa8543..4283b1943f 100644
--- a/awx/ui/client/src/app.js
+++ b/awx/ui/client/src/app.js
@@ -1061,20 +1061,6 @@ var tower = angular.module('Tower', [
 
 
                 $rootScope.$on("$stateChangeStart", function (event, next, nextParams, prev) {
-                    // broadcast event change if editing crud object
-                    if ($location.$$path.split("/")[2]) {
-                        var list = $location.$$path.split("/")[1];
-                        var id = $location.$$path.split("/")[2];
-
-                        delete $rootScope.listBeingEdited;
-                        delete $rootScope.rowBeingEdited;
-
-                        $rootScope.$broadcast("EditIndicatorChange", list, id);
-                    } else if ($rootScope.addedAnItem) {
-                        delete $rootScope.addedAnItem;
-                    } else {
-                        $rootScope.$broadcast("RemoveIndicator");
-                    }
 
                     // this line removes the query params attached to a route
                     if(prev && prev.$$route &&
@@ -1128,6 +1114,23 @@ var tower = angular.module('Tower', [
                     activateTab();
                 });
 
+                $rootScope.$on('$stateChangeSuccess', function(event, toState, toParams, fromState, fromParams) {
+                    // broadcast event change if editing crud object
+                    if ($location.$$path.split("/")[2]) {
+                        var list = $location.$$path.split("/")[1];
+                        var id = $location.$$path.split("/")[2];
+
+                        delete $rootScope.listBeingEdited;
+                        delete $rootScope.rowBeingEdited;
+
+                        $rootScope.$broadcast("EditIndicatorChange", list, id);
+                    } else if ($rootScope.addedAnItem) {
+                        delete $rootScope.addedAnItem;
+                    } else {
+                        $rootScope.$broadcast("RemoveIndicator");
+                    }
+                });
+
                 if (!Authorization.getToken() || !Authorization.isUserLoggedIn()) {
                     // User not authenticated, redirect to login page
                     $rootScope.sessionExpired = false;