From 7167fd7c6b9f3d31c014db08f99f6e4095dee7c0 Mon Sep 17 00:00:00 2001 From: Leigh Johnson Date: Fri, 4 Nov 2016 16:51:06 -0400 Subject: [PATCH] Target correct view in portal mode & activity stream route definitions #3851 (#3869) --- awx/ui/client/src/activity-stream/activitystream.route.js | 2 +- awx/ui/client/src/portal-mode/portal-mode.route.js | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/awx/ui/client/src/activity-stream/activitystream.route.js b/awx/ui/client/src/activity-stream/activitystream.route.js index 3fa3d961c9..d4af2bd0aa 100644 --- a/awx/ui/client/src/activity-stream/activitystream.route.js +++ b/awx/ui/client/src/activity-stream/activitystream.route.js @@ -30,7 +30,7 @@ export default { $('body').removeClass('modal-open'); }, views: { - 'list@': { + '@': { controller: 'activityStreamController', templateProvider: function(StreamList, generateList) { let html = generateList.build({ diff --git a/awx/ui/client/src/portal-mode/portal-mode.route.js b/awx/ui/client/src/portal-mode/portal-mode.route.js index e9924394c6..9f9f159085 100644 --- a/awx/ui/client/src/portal-mode/portal-mode.route.js +++ b/awx/ui/client/src/portal-mode/portal-mode.route.js @@ -32,10 +32,10 @@ export default { } }, views: { - 'list@': { + '@': { templateUrl: templateUrl('portal-mode/portal-mode-layout'), - controller: ['$scope', '$rootScope', '$state', '$stateParams', 'GetBasePath', 'QuerySet', 'jobsDataset', - function($scope, $rootScope, $state, $stateParams, GetBasePath, qs, Dataset) { + controller: ['$scope', '$rootScope', '$state', '$stateParams', 'GetBasePath', 'QuerySet', + function($scope, $rootScope, $state, $stateParams, GetBasePath, qs) { let path; init();