diff --git a/awx/ui/build/webpack.watch.js b/awx/ui/build/webpack.watch.js index d653707847..6ec25bed5a 100644 --- a/awx/ui/build/webpack.watch.js +++ b/awx/ui/build/webpack.watch.js @@ -26,7 +26,13 @@ const watch = { test: /\.js$/, enforce: 'pre', exclude: /node_modules/, - loader: 'eslint-loader' + loader: 'eslint-loader', + options: { + failOnWarning: false, + failOnError: false, + emitError: false, + emitWarning: false + } } ] }, diff --git a/awx/ui/client/features/output/index.controller.js b/awx/ui/client/features/output/index.controller.js index 8a730a99c8..358750aefb 100644 --- a/awx/ui/client/features/output/index.controller.js +++ b/awx/ui/client/features/output/index.controller.js @@ -1,4 +1,5 @@ -function JobsIndexController () { +function JobsIndexController (resolved) { + console.log('test', resolved); } module.exports = JobsIndexController; diff --git a/awx/ui/client/features/output/index.js b/awx/ui/client/features/output/index.js index 03b596e00a..f7f0e9c768 100644 --- a/awx/ui/client/features/output/index.js +++ b/awx/ui/client/features/output/index.js @@ -17,9 +17,20 @@ function JobsRun ($stateExtender, strings) { activityStreamTarget: 'jobs' }, views: { - templateUrl: indexTemplate, - controller: IndexController, - controllerAs: 'vm' + '@': { + templateUrl: indexTemplate, + controller: IndexController, + controllerAs: 'vm' + } + }, + resolve: { + resolved: ['JobsModel', Jobs => { + const jobs = new Jobs(); + + return { + models: { jobs } + }; + }] } }); } diff --git a/awx/ui/client/features/output/index.view.html b/awx/ui/client/features/output/index.view.html index 36bd84a02d..de0177058e 100644 --- a/awx/ui/client/features/output/index.view.html +++ b/awx/ui/client/features/output/index.view.html @@ -1,3 +1,12 @@ -
- test -
+left
+right
+