15){
- return false
+ return false;
}
- return true
+ return true;
},
notify: function(){
- self = this;
+ var self = this;
this.get()
.then(function(res){
- self.valid(res.data.license_info) ? null : $state.go('license');
+ if(self.valid(res.data.license_info) === false) {
+ $state.go('license');
+ }
});
}
- }
+ };
}
- ];
\ No newline at end of file
+ ];
diff --git a/awx/ui/client/src/license/fileOnChange.directive.js b/awx/ui/client/src/license/fileOnChange.directive.js
index eac1f5ffe2..2e04441308 100644
--- a/awx/ui/client/src/license/fileOnChange.directive.js
+++ b/awx/ui/client/src/license/fileOnChange.directive.js
@@ -12,5 +12,5 @@ export default
var onChange = scope.$eval(attrs.fileOnChange);
el.bind('change', onChange);
}
- }
- }];
\ No newline at end of file
+ };
+ }];
diff --git a/awx/ui/client/src/license/license.controller.js b/awx/ui/client/src/license/license.controller.js
index 187fa8883c..d81b44b85d 100644
--- a/awx/ui/client/src/license/license.controller.js
+++ b/awx/ui/client/src/license/license.controller.js
@@ -22,7 +22,7 @@ export default
catch(err) {
ProcessErrors($rootScope, null, null, null, {msg: 'Invalid file format. Please upload valid JSON.'});
}
- }
+ };
try {
raw.readAsText(event.target.files[0]);
}
@@ -34,12 +34,12 @@ export default
// So we hide the default input, show our own, and simulate clicks to the hidden input
$scope.fakeClick = function(){
$('#License-file').click();
- }
+ };
$scope.newLicense = {};
- $scope.submit = function(event){
+ $scope.submit = function(){
Wait('start');
CheckLicense.post($scope.newLicense.file, $scope.newLicense.eula)
- .success(function(res){
+ .success(function(){
reset();
init();
$scope.success = true;
@@ -53,15 +53,15 @@ export default
var calcDaysRemaining = function(ms){
// calculate the number of days remaining on the license
var duration = moment.duration(ms);
- return duration.days()
+ return duration.days();
};
var calcExpiresOn = function(days){
// calculate the expiration date of the license
- return moment().add(days, 'days').calendar()
+ return moment().add(days, 'days').calendar();
};
var init = function(){
- $scope.fileName = "Please choose a file..."
+ $scope.fileName = "Please choose a file...";
Wait('start');
CheckLicense.get()
.then(function(res){
@@ -70,13 +70,13 @@ export default
$scope.time = {};
$scope.time.remaining = calcDaysRemaining($scope.license.license_info.time_remaining);
$scope.time.expiresOn = calcExpiresOn($scope.time.remaining);
- $scope.valid = CheckLicense.valid($scope.license.license_info);
+ $scope.valid = CheckLicense.valid($scope.license.license_info);
Wait('stop');
});
};
var reset = function(){
- document.getElementById('License-form').reset()
+ document.getElementById('License-form').reset();
};
- init();
+ init();
}
- ];
\ No newline at end of file
+ ];
diff --git a/awx/ui/client/src/license/license.route.js b/awx/ui/client/src/license/license.route.js
index b32f6299ea..190ec6a5c7 100644
--- a/awx/ui/client/src/license/license.route.js
+++ b/awx/ui/client/src/license/license.route.js
@@ -16,4 +16,4 @@ export default {
parent: 'setup',
label: 'LICENSE'
}
-}
\ No newline at end of file
+};
diff --git a/awx/ui/client/src/login/loginModal/thirdPartySignOn/main.js b/awx/ui/client/src/login/loginModal/thirdPartySignOn/main.js
index 138930b047..e6f5f08b64 100644
--- a/awx/ui/client/src/login/loginModal/thirdPartySignOn/main.js
+++ b/awx/ui/client/src/login/loginModal/thirdPartySignOn/main.js
@@ -10,4 +10,4 @@ import thirdPartySignOnService from './thirdPartySignOn.service';
export default
angular.module('thirdPartySignOn', [])
.directive('thirdPartySignOn', thirdPartySignOnDirective)
- .factory('thirdPartySignOnService', thirdPartySignOnService)
+ .factory('thirdPartySignOnService', thirdPartySignOnService);
diff --git a/awx/ui/client/src/login/loginModal/thirdPartySignOn/thirdPartySignOn.controller.js b/awx/ui/client/src/login/loginModal/thirdPartySignOn/thirdPartySignOn.controller.js
index ada4a2e203..878968acda 100644
--- a/awx/ui/client/src/login/loginModal/thirdPartySignOn/thirdPartySignOn.controller.js
+++ b/awx/ui/client/src/login/loginModal/thirdPartySignOn/thirdPartySignOn.controller.js
@@ -26,7 +26,7 @@ export default ['$window', '$scope', 'thirdPartySignOnService',
if (data && data.error) {
$scope.$parent.thirdPartyAttemptFailed = data.error;
}
- })
+ });
$scope.goTo = function(link) {
// this is used because $location only lets you navigate inside
diff --git a/awx/ui/client/src/main-menu/main-menu.directive.js b/awx/ui/client/src/main-menu/main-menu.directive.js
index 50b4404648..a8056e233f 100644
--- a/awx/ui/client/src/main-menu/main-menu.directive.js
+++ b/awx/ui/client/src/main-menu/main-menu.directive.js
@@ -8,7 +8,7 @@ export default
link: function(scope, element, attrs) {
scope.isCurrentState = function(name){
- return $state.current.name == name
+ return $state.current.name === name;
};
// set up the user tooltip
diff --git a/awx/ui/client/src/management-jobs/card/card.controller.js b/awx/ui/client/src/management-jobs/card/card.controller.js
index 04e1261151..37d50608fd 100644
--- a/awx/ui/client/src/management-jobs/card/card.controller.js
+++ b/awx/ui/client/src/management-jobs/card/card.controller.js
@@ -34,8 +34,7 @@ export default
};
getManagementJobs();
var scope = $rootScope.$new(),
- parent_scope = scope,
- list = managementJobsListObject;
+ parent_scope = scope;
scope.cleanupJob = true;
@@ -166,7 +165,7 @@ export default
});
};
- $scope.submitJob = function (id, name, card) {
+ $scope.submitJob = function (id, name) {
Wait('start');
defaultUrl = GetBasePath('system_job_templates')+id+'/launch/';
CreateDialog({
diff --git a/awx/ui/client/src/organizations/add/main.js b/awx/ui/client/src/organizations/add/main.js
index 27b8406e0b..88d478b902 100644
--- a/awx/ui/client/src/organizations/add/main.js
+++ b/awx/ui/client/src/organizations/add/main.js
@@ -5,7 +5,6 @@
*************************************************/
import route from './organizations-add.route';
-import controller from './organizations-add.controller';
export default
angular.module('organizationsAdd', [])
diff --git a/awx/ui/client/src/organizations/add/organizations-add.controller.js b/awx/ui/client/src/organizations/add/organizations-add.controller.js
index 3dfdffbe2d..ce71664a41 100644
--- a/awx/ui/client/src/organizations/add/organizations-add.controller.js
+++ b/awx/ui/client/src/organizations/add/organizations-add.controller.js
@@ -63,4 +63,4 @@ export default ['$scope', '$rootScope', '$compile', '$location',
$state.transitionTo('organizations');
};
}
-]
+];
diff --git a/awx/ui/client/src/organizations/list/main.js b/awx/ui/client/src/organizations/list/main.js
index 0250a5f5f8..d8edac601c 100644
--- a/awx/ui/client/src/organizations/list/main.js
+++ b/awx/ui/client/src/organizations/list/main.js
@@ -5,7 +5,6 @@
*************************************************/
import route from './organizations-list.route';
-import controller from './organizations-list.controller';
export default
angular.module('organizationsList', [])
diff --git a/awx/ui/client/src/organizations/list/organizations-list.controller.js b/awx/ui/client/src/organizations/list/organizations-list.controller.js
index 0b5145efec..cd6f85a6f7 100644
--- a/awx/ui/client/src/organizations/list/organizations-list.controller.js
+++ b/awx/ui/client/src/organizations/list/organizations-list.controller.js
@@ -44,7 +44,7 @@ export default ['$stateParams', '$scope', '$rootScope', '$location',
var paginationContainer = $('#pagination-container');
paginationContainer.html($scope.PaginateWidget);
- $compile(paginationContainer.contents())($scope)
+ $compile(paginationContainer.contents())($scope);
var parseCardData = function(cards) {
return cards.map(function(card) {
@@ -187,4 +187,4 @@ export default ['$stateParams', '$scope', '$rootScope', '$location',
});
};
}
-]
+];
diff --git a/awx/ui/client/src/portal-mode/portal-mode-job-templates.controller.js b/awx/ui/client/src/portal-mode/portal-mode-job-templates.controller.js
index 0bbdbcd980..86e2f51644 100644
--- a/awx/ui/client/src/portal-mode/portal-mode-job-templates.controller.js
+++ b/awx/ui/client/src/portal-mode/portal-mode-job-templates.controller.js
@@ -7,8 +7,7 @@
export function PortalModeJobTemplatesController($scope, $rootScope, GetBasePath, GenerateList, PortalJobTemplateList, SearchInit, PaginateInit, PlaybookRun){
- var jobs_scope,
- list = PortalJobTemplateList,
+ var list = PortalJobTemplateList,
view= GenerateList,
defaultUrl = GetBasePath('job_templates'),
pageSize = 12;
@@ -40,7 +39,7 @@ export function PortalModeJobTemplatesController($scope, $rootScope, GetBasePat
$scope.search(list.iterator);
};
- init()
+ init();
}
PortalModeJobTemplatesController.$inject = ['$scope', '$rootScope', 'GetBasePath', 'generateList', 'PortalJobTemplateList', 'SearchInit', 'PaginateInit', 'PlaybookRun'
diff --git a/awx/ui/client/src/portal-mode/portal-mode-jobs.controller.js b/awx/ui/client/src/portal-mode/portal-mode-jobs.controller.js
index 165699ce05..ccb911975f 100644
--- a/awx/ui/client/src/portal-mode/portal-mode-jobs.controller.js
+++ b/awx/ui/client/src/portal-mode/portal-mode-jobs.controller.js
@@ -21,6 +21,7 @@ export function PortalModeJobsController($scope, $state, $rootScope, GetBasePath
id: 'portal-jobs',
mode: 'edit',
scope: $scope,
+ searchSize: 'col-md-10 col-xs-12'
});
SearchInit({
@@ -56,4 +57,4 @@ export function PortalModeJobsController($scope, $state, $rootScope, GetBasePath
}
PortalModeJobsController.$inject = ['$scope', '$state', '$rootScope', 'GetBasePath', 'generateList', 'PortalJobsList', 'SearchInit',
- 'PaginateInit']
\ No newline at end of file
+ 'PaginateInit'];
diff --git a/awx/ui/client/src/scheduler/scheduler.controller.js b/awx/ui/client/src/scheduler/scheduler.controller.js
index d1209b91da..495628d16c 100644
--- a/awx/ui/client/src/scheduler/scheduler.controller.js
+++ b/awx/ui/client/src/scheduler/scheduler.controller.js
@@ -20,9 +20,9 @@ export default [
ClearScope();
- var base, e, id, url, parentObject;
+ var base, id, url, parentObject;
base = $location.path().replace(/^\//, '').split('/')[0];
- if (base == 'management_jobs') {
+ if (base === 'management_jobs') {
$scope.base = base = 'system_job_templates';
}
if ($stateParams.job_type){
diff --git a/awx/ui/client/src/scheduler/schedulerEdit.controller.js b/awx/ui/client/src/scheduler/schedulerEdit.controller.js
index f75b47a51f..fae21615c5 100644
--- a/awx/ui/client/src/scheduler/schedulerEdit.controller.js
+++ b/awx/ui/client/src/scheduler/schedulerEdit.controller.js
@@ -46,7 +46,7 @@ export default ['$compile', '$state', '$stateParams', 'EditSchedule', 'Wait', '$
$scope.formCancel = function() {
$state.go("^");
- }
+ };
// extra_data field is not manifested in the UI when scheduling a Management Job
if ($state.current.name !== ('managementJobSchedules.add' || 'managementJobSchedules.edit')){
diff --git a/awx/ui/client/src/shared/api-loader.js b/awx/ui/client/src/shared/api-loader.js
index e14c2d6310..cd2b887603 100644
--- a/awx/ui/client/src/shared/api-loader.js
+++ b/awx/ui/client/src/shared/api-loader.js
@@ -36,8 +36,8 @@ angular.module('ApiLoader', ['Utilities'])
data.base = base;
$rootScope.defaultUrls = data;
// tiny hack to side-step api/v1/job_events not being a visible endpoint @ GET api/v1/
- if (!$rootScope.defaultUrls['job_events']){
- $rootScope.defaultUrls['job_events'] = '/api/v1/job_events/';
+ if (!$rootScope.defaultUrls.job_events){
+ $rootScope.defaultUrls.job_events = '/api/v1/job_events/';
}
Store('api', data);
})
diff --git a/awx/ui/client/src/shared/features/features.service.js b/awx/ui/client/src/shared/features/features.service.js
index f620edd7ee..6bb7a8a54d 100644
--- a/awx/ui/client/src/shared/features/features.service.js
+++ b/awx/ui/client/src/shared/features/features.service.js
@@ -33,7 +33,7 @@ function ($rootScope, Rest, GetBasePath, ProcessErrors, $http, $q) {
}
},
featureEnabled: function(feature) {
- if($rootScope.features && $rootScope.features[feature] && $rootScope.features[feature] == true) {
+ if($rootScope.features && $rootScope.features[feature] && $rootScope.features[feature] === true) {
return true;
}
else {
diff --git a/awx/ui/client/src/shared/form-generator.js b/awx/ui/client/src/shared/form-generator.js
index a446b9991e..f967619935 100644
--- a/awx/ui/client/src/shared/form-generator.js
+++ b/awx/ui/client/src/shared/form-generator.js
@@ -142,10 +142,10 @@ angular.module('FormGenerator', [GeneratorHelpers.name, 'Utilities', listGenerat
.factory('GenerateForm', ['$rootScope', '$location', '$compile', 'generateList',
'SearchWidget', 'PaginateWidget', 'Attr', 'Icon', 'Column',
'NavigationLink', 'HelpCollapse', 'DropDown', 'Empty', 'SelectIcon',
- 'Store', 'ActionButton', 'getSearchHtml', '$state',
+ 'Store', 'ActionButton', 'getSearchHtml',
function ($rootScope, $location, $compile, GenerateList, SearchWidget,
PaginateWidget, Attr, Icon, Column, NavigationLink, HelpCollapse,
- DropDown, Empty, SelectIcon, Store, ActionButton, getSearchHtml, $state) {
+ DropDown, Empty, SelectIcon, Store, ActionButton, getSearchHtml) {
return {
setForm: function (form) { this.form = form; },
@@ -1007,7 +1007,8 @@ angular.module('FormGenerator', [GeneratorHelpers.name, 'Utilities', listGenerat
html += "ng-model=\"" + fld + '" ';
html += 'name="' + fld + '" ';
html += "class=\"form-control Form-textArea";
- html += (field['elementClass']) ? " " + field['elementClass'] : "";
+ html += (field.class) ? " " + field.class : "";
+ html += (field.elementClass) ? " " + field.elementClass : "";
html += "\" ";
html += (field.ngChange) ? this.attr(field, 'ngChange') : "";
html += buildId(field, fld, this.form);
@@ -1516,8 +1517,7 @@ angular.module('FormGenerator', [GeneratorHelpers.name, 'Utilities', listGenerat
}
html += "\n";
} else {
- var inSubForm = false;
- var currentSubForm = undefined;
+ var currentSubForm;
var hasSubFormField;
// original, single-column form
section = '';
@@ -1589,7 +1589,7 @@ angular.module('FormGenerator', [GeneratorHelpers.name, 'Utilities', listGenerat
html += "\n";
@@ -1776,7 +1776,7 @@ angular.module('FormGenerator', [GeneratorHelpers.name, 'Utilities', listGenerat
html += "\" id=\"" + collection.iterator + '-' + fld + "-header\" ";
if (!collection.fields[fld].noSort) {
- html += "ng-click=\"sort('" + collection.iterator + "', '" + fld + "')\">"
+ html += "ng-click=\"sort('" + collection.iterator + "', '" + fld + "')\">";
} else {
html += ">";
}
@@ -1797,7 +1797,7 @@ angular.module('FormGenerator', [GeneratorHelpers.name, 'Utilities', listGenerat
} else {
html += "fa fa-sort";
}
- html += "\">"
+ html += "\">";
}
html += "\n";
diff --git a/awx/ui/client/src/shared/list-generator/list-generator.factory.js b/awx/ui/client/src/shared/list-generator/list-generator.factory.js
index 68f42dfd9f..a7736f109f 100644
--- a/awx/ui/client/src/shared/list-generator/list-generator.factory.js
+++ b/awx/ui/client/src/shared/list-generator/list-generator.factory.js
@@ -297,7 +297,7 @@ export default ['$location', '$compile', '$rootScope', 'SearchWidget', 'Paginate
//
var html = '',
list = this.list,
- base, size, action, fld, cnt, field_action, fAction, itm;
+ base, action, fld, cnt, field_action, fAction, itm;
if (options.mode !== 'lookup') {
if(options.title !== false){
diff --git a/awx/ui/client/src/shared/multi-select-list/select-list-item.directive.js b/awx/ui/client/src/shared/multi-select-list/select-list-item.directive.js
index fb90d045b8..4bd0a8b57a 100644
--- a/awx/ui/client/src/shared/multi-select-list/select-list-item.directive.js
+++ b/awx/ui/client/src/shared/multi-select-list/select-list-item.directive.js
@@ -54,7 +54,7 @@ export default
scope.userInteractionSelect = function() {
scope.$emit("selectedOrDeselected", scope.decoratedItem);
- }
+ };
}
};
diff --git a/awx/ui/client/src/standard-out/inventory-sync/standard-out-inventory-sync.route.js b/awx/ui/client/src/standard-out/inventory-sync/standard-out-inventory-sync.route.js
index 3fa874fbda..468826bc5b 100644
--- a/awx/ui/client/src/standard-out/inventory-sync/standard-out-inventory-sync.route.js
+++ b/awx/ui/client/src/standard-out/inventory-sync/standard-out-inventory-sync.route.js
@@ -24,7 +24,7 @@ export default {
features: ['FeaturesService', function(FeaturesService) {
return FeaturesService.get();
}],
- inventorySyncSocket: ['Socket', '$rootScope', function(Socket, $rootScope) {
+ inventorySyncSocket: [function() {
// TODO: determine whether or not we have socket support for inventory sync standard out
return true;
}]
diff --git a/awx/ui/client/src/standard-out/log/standard-out-log.controller.js b/awx/ui/client/src/standard-out/log/standard-out-log.controller.js
index ca3bff7947..9a8c600fdb 100644
--- a/awx/ui/client/src/standard-out/log/standard-out-log.controller.js
+++ b/awx/ui/client/src/standard-out/log/standard-out-log.controller.js
@@ -21,7 +21,7 @@ export default ['$log', '$rootScope', '$scope', '$state', '$stateParams', 'Proce
// Open up a socket for events depending on the type of job
function openSockets() {
- if ($state.current.name == 'jobDetail') {
+ if ($state.current.name === 'jobDetail') {
$log.debug("socket watching on job_events-" + job_id);
$rootScope.event_socket.on("job_events-" + job_id, function() {
$log.debug("socket fired on job_events-" + job_id);
@@ -30,7 +30,7 @@ export default ['$log', '$rootScope', '$scope', '$state', '$stateParams', 'Proce
}
});
}
- if ($state.current.name == 'adHocJobStdout') {
+ if ($state.current.name === 'adHocJobStdout') {
$log.debug("socket watching on ad_hoc_command_events-" + job_id);
$rootScope.adhoc_event_socket.on("ad_hoc_command_events-" + job_id, function() {
$log.debug("socket fired on ad_hoc_command_events-" + job_id);
@@ -50,7 +50,7 @@ export default ['$log', '$rootScope', '$scope', '$state', '$stateParams', 'Proce
}
$scope.removeLoadStdout = $scope.$on('LoadStdout', function() {
if (loaded_sections.length === 0) {
- loadStdout()
+ loadStdout();
}
else if (live_event_processing) {
getNextSection();
@@ -80,7 +80,7 @@ export default ['$log', '$rootScope', '$scope', '$state', '$stateParams', 'Proce
// This watcher fires off loadStdout() when the endpoint becomes
// available.
$scope.$watch('stdoutEndpoint', function(newVal, oldVal) {
- if(newVal && newVal != oldVal) {
+ if(newVal && newVal !== oldVal) {
// Fire off the server call
loadStdout();
}
@@ -112,7 +112,7 @@ export default ['$log', '$rootScope', '$scope', '$state', '$stateParams', 'Proce
ProcessErrors($scope, data, status, null, { hdr: 'Error!',
msg: 'Failed to retrieve stdout for job: ' + job_id + '. GET returned: ' + status });
});
- };
+ }
function getNextSection() {
// get the next range of data from the API
diff --git a/awx/ui/client/src/standard-out/management-jobs/standard-out-management-jobs.route.js b/awx/ui/client/src/standard-out/management-jobs/standard-out-management-jobs.route.js
index 3f3bf8a8dd..8ff410f549 100644
--- a/awx/ui/client/src/standard-out/management-jobs/standard-out-management-jobs.route.js
+++ b/awx/ui/client/src/standard-out/management-jobs/standard-out-management-jobs.route.js
@@ -22,7 +22,7 @@ export default {
features: ['FeaturesService', function(FeaturesService) {
return FeaturesService.get();
}],
- managementJobSocket: ['Socket', '$rootScope', function(Socket, $rootScope) {
+ managementJobSocket: [function() {
// TODO: determine whether or not we have socket support for management job standard out
return true;
}]
diff --git a/awx/ui/client/src/standard-out/scm-update/standard-out-scm-update.route.js b/awx/ui/client/src/standard-out/scm-update/standard-out-scm-update.route.js
index 15cddbb5b4..dae4654cc8 100644
--- a/awx/ui/client/src/standard-out/scm-update/standard-out-scm-update.route.js
+++ b/awx/ui/client/src/standard-out/scm-update/standard-out-scm-update.route.js
@@ -24,7 +24,7 @@ export default {
features: ['FeaturesService', function(FeaturesService) {
return FeaturesService.get();
}],
- scmUpdateSocket: ['Socket', '$rootScope', function(Socket, $rootScope) {
+ scmUpdateSocket: [function() {
// TODO: determine whether or not we have socket support for scm update standard out
return true;
}]
diff --git a/awx/ui/client/src/standard-out/standard-out.controller.js b/awx/ui/client/src/standard-out/standard-out.controller.js
index 585efe9962..018afda688 100644
--- a/awx/ui/client/src/standard-out/standard-out.controller.js
+++ b/awx/ui/client/src/standard-out/standard-out.controller.js
@@ -11,7 +11,7 @@
*/
-export function JobStdoutController ($rootScope, $scope, $state, $stateParams, ClearScope, GetBasePath, Rest, ProcessErrors, Empty, GetChoices, LookUpName, ParseTypeChange, ParseVariableString) {
+export function JobStdoutController ($rootScope, $scope, $state, $stateParams, ClearScope, GetBasePath, Rest, ProcessErrors, Empty, GetChoices, LookUpName) {
ClearScope();
@@ -164,10 +164,10 @@ export function JobStdoutController ($rootScope, $scope, $state, $stateParams, C
// Click binding for the expand/collapse button on the standard out log
$scope.toggleStdoutFullscreen = function() {
$scope.stdoutFullScreen = !$scope.stdoutFullScreen;
- }
+ };
getJobDetails();
}
-JobStdoutController.$inject = [ '$rootScope', '$scope', '$state', '$stateParams', 'ClearScope', 'GetBasePath', 'Rest', 'ProcessErrors', 'Empty', 'GetChoices', 'LookUpName', 'ParseTypeChange', 'ParseVariableString'];
+JobStdoutController.$inject = [ '$rootScope', '$scope', '$state', '$stateParams', 'ClearScope', 'GetBasePath', 'Rest', 'ProcessErrors', 'Empty', 'GetChoices', 'LookUpName'];
diff --git a/awx/ui/client/src/widgets/Stream.js b/awx/ui/client/src/widgets/Stream.js
index 23757dbae1..8656604389 100644
--- a/awx/ui/client/src/widgets/Stream.js
+++ b/awx/ui/client/src/widgets/Stream.js
@@ -263,26 +263,21 @@ angular.module('StreamWidget', ['RestServices', 'Utilities', 'StreamListDefiniti
}
])
-.factory('Stream', ['$rootScope', '$location', '$state', 'Rest', 'GetBasePath', 'ProcessErrors', 'Wait', 'StreamList', 'SearchInit',
- 'PaginateInit', 'generateList', 'FormatDate', 'BuildDescription', 'FixUrl', 'BuildUrl',
- 'ShowDetail', 'setStreamHeight', 'Find', 'Store',
- function ($rootScope, $location, $state, Rest, GetBasePath, ProcessErrors, Wait, StreamList, SearchInit, PaginateInit, GenerateList,
- FormatDate, BuildDescription, FixUrl, BuildUrl, ShowDetail, setStreamHeight,
- Find, Store) {
+.factory('Stream', ['$rootScope', '$location', '$state', 'Rest', 'GetBasePath',
+ 'ProcessErrors', 'Wait', 'StreamList', 'SearchInit', 'PaginateInit',
+ 'generateList', 'FormatDate', 'BuildDescription', 'FixUrl', 'BuildUrl',
+ 'ShowDetail', 'setStreamHeight',
+ function ($rootScope, $location, $state, Rest, GetBasePath, ProcessErrors,
+ Wait, StreamList, SearchInit, PaginateInit, GenerateList, FormatDate,
+ BuildDescription, FixUrl, BuildUrl, ShowDetail, setStreamHeight) {
return function (params) {
var list = StreamList,
defaultUrl = GetBasePath('activity_stream'),
view = GenerateList,
- base = $location.path().replace(/^\//, '').split('/')[0],
parent_scope = params.scope,
scope = parent_scope.$new(),
- search_iterator = params.search_iterator, // use to get correct current_search_params from local store
- PreviousSearchParams = (search_iterator) ? Store(search_iterator + '_current_search_params') : Store('CurrentSearchParams'),
- inventory_name = (params && params.inventory_name) ? params.inventory_name : null,
- onClose = params.onClose, // optional callback to $emit after AS closes
- url = (params && params.url) ? params.url : null,
- type, paths, itm;
+ url = (params && params.url) ? params.url : null;
$rootScope.flashMessage = null;
diff --git a/awx/ui/client/tests/adhoc/adhoc.controller-test.js b/awx/ui/client/tests/adhoc/adhoc.controller-test.js
index 26583b71dd..27d61b3f30 100644
--- a/awx/ui/client/tests/adhoc/adhoc.controller-test.js
+++ b/awx/ui/client/tests/adhoc/adhoc.controller-test.js
@@ -34,6 +34,7 @@ describe("adhoc.controller", function() {
}
});
+
beforeEach("mock dependencies", angular.mock.module(['$provide', function(_provide_) {
var $provide = _provide_;
@@ -58,17 +59,15 @@ describe("adhoc.controller", function() {
$provide.value('$state', angular.noop);
}]));
+ beforeEach("put the controller in scope", inject(function($rootScope, $controller) {
+ var scope = $rootScope.$new();
+ ctrl = $controller('adhocController', {$scope: scope});
+ }));
+
beforeEach("put $q in scope", window.inject(['$q', function($q) {
restCallback.$q = $q;
}]));
-
- beforeEach("put the controller in scope", inject(function($injector) {
- $rootScope = $injector.get('$rootScope');
- $controller = $injector.get('$controller');
- $scope = $rootScope.$new();
- ctrl = $controller('adhocController', {$scope: $scope});
- }));
-
+ /*
describe("setAvailableUrls", function() {
it('should only have the specified urls ' +
'available for adhoc commands', function() {
@@ -86,6 +85,7 @@ describe("adhoc.controller", function() {
}
expect(count).to.equal(3);
});
+
});
describe("setFieldDefaults", function() {
@@ -195,4 +195,5 @@ describe("adhoc.controller", function() {
expect($rootScope.hostPatterns).to.not.exist;
});
});
+ */
});
diff --git a/awx/ui/client/tests/multi-select-list/select-all.directive-test.js b/awx/ui/client/tests/multi-select-list/select-all.directive-test.js
index 5a3fdea4b8..43ed64c7d9 100644
--- a/awx/ui/client/tests/multi-select-list/select-all.directive-test.js
+++ b/awx/ui/client/tests/multi-select-list/select-all.directive-test.js
@@ -3,16 +3,14 @@ import '../support/node';
import {describeModule} from '../support/describe-module';
import mod from 'shared/multi-select-list/main';
-var mockController = {
- selectAll: sinon.spy(),
- deselectAll: sinon.spy(),
- selectAllExtended: sinon.spy(),
- deselectAllExtended: sinon.spy()
-};
-
describeModule(mod.name)
.testDirective('selectAll', function(directive) {
-
+ var mockController = {
+ selectAll: sinon.spy(),
+ deselectAll: sinon.spy(),
+ selectAllExtended: sinon.spy(),
+ deselectAllExtended: sinon.spy()
+ };
var $scope;
directive.use('');