diff --git a/ansibleworks/ui/static/js/controllers/Admins.js b/ansibleworks/ui/static/js/controllers/Admins.js index f5c901fb22..5fef8df68e 100644 --- a/ansibleworks/ui/static/js/controllers/Admins.js +++ b/ansibleworks/ui/static/js/controllers/Admins.js @@ -21,12 +21,23 @@ function AdminsList ($scope, $rootScope, $location, $log, $routeParams, Rest, var scope = view.inject(AdminList, { mode: mode }); // Inject our view scope.selected = []; + if (scope.PostRefreshRemove) { + scope.PostRefreshRemove(); + } + scope.PostRefreshRemove = scope.$on('PostRefresh', function() { + $("tr.success").each(function(index) { + // Make sure no rows have a green background + var ngc = $(this).attr('ng-class'); + scope[ngc] = ""; + }); + }); + SearchInit({ scope: scope, set: 'admins', list: list, url: defaultUrl }); PaginateInit({ scope: scope, list: list, url: defaultUrl }); scope.search(list.iterator); LoadBreadCrumbs(); - + scope.finishSelection = function() { var url = GetBasePath('organizations') + $routeParams.organization_id + '/admins/' Rest.setUrl(url); diff --git a/ansibleworks/ui/static/js/controllers/Credentials.js b/ansibleworks/ui/static/js/controllers/Credentials.js index 4e04125131..163f005f21 100644 --- a/ansibleworks/ui/static/js/controllers/Credentials.js +++ b/ansibleworks/ui/static/js/controllers/Credentials.js @@ -24,6 +24,17 @@ function CredentialsList ($scope, $rootScope, $location, $log, $routeParams, Res var scope = view.inject(CredentialList, { mode: mode }); // Inject our view scope.selected = []; + if (scope.PostRefreshRemove) { + scope.PostRefreshRemove(); + } + scope.PostRefreshRemove = scope.$on('PostRefresh', function() { + $("tr.success").each(function(index) { + // Make sure no rows have a green background + var ngc = $(this).attr('ng-class'); + scope[ngc] = ""; + }); + }); + SearchInit({ scope: scope, set: 'credentials', list: list, url: defaultUrl }); PaginateInit({ scope: scope, list: list, url: defaultUrl }); scope.search(list.iterator); diff --git a/ansibleworks/ui/static/js/controllers/Inventories.js b/ansibleworks/ui/static/js/controllers/Inventories.js index ab0b8a82a7..6b02e8b9d5 100644 --- a/ansibleworks/ui/static/js/controllers/Inventories.js +++ b/ansibleworks/ui/static/js/controllers/Inventories.js @@ -24,6 +24,17 @@ function InventoriesList ($scope, $rootScope, $location, $log, $routeParams, Res var scope = view.inject(InventoryList, { mode: mode }); // Inject our view scope.selected = []; + if (scope.PostRefreshRemove) { + scope.PostRefreshRemove(); + } + scope.PostRefreshRemove = scope.$on('PostRefresh', function() { + $("tr.success").each(function(index) { + // Make sure no rows have a green background + var ngc = $(this).attr('ng-class'); + scope[ngc] = ""; + }); + }); + SearchInit({ scope: scope, set: 'inventories', list: list, url: defaultUrl }); PaginateInit({ scope: scope, list: list, url: defaultUrl }); scope.search(list.iterator); diff --git a/ansibleworks/ui/static/js/controllers/JobTemplates.js b/ansibleworks/ui/static/js/controllers/JobTemplates.js index 2687e9a90a..4bc31fef7c 100644 --- a/ansibleworks/ui/static/js/controllers/JobTemplates.js +++ b/ansibleworks/ui/static/js/controllers/JobTemplates.js @@ -25,6 +25,18 @@ function JobTemplatesList ($scope, $rootScope, $location, $log, $routeParams, Re var scope = view.inject(list, { mode: mode }); scope.selected = []; + if (scope.PostRefreshRemove) { + scope.PostRefreshRemove(); + } + scope.PostRefreshRemove = scope.$on('PostRefresh', function() { + $("tr.success").each(function(index) { + // Make sure no rows have a green background + var ngc = $(this).attr('ng-class'); + scope[ngc] = ""; + }); + }); + + SearchInit({ scope: scope, set: 'job_templates', list: list, url: defaultUrl }); PaginateInit({ scope: scope, list: list, url: defaultUrl }); scope.search(list.iterator); diff --git a/ansibleworks/ui/static/js/controllers/Jobs.js b/ansibleworks/ui/static/js/controllers/Jobs.js index 90154869e5..946af37351 100644 --- a/ansibleworks/ui/static/js/controllers/Jobs.js +++ b/ansibleworks/ui/static/js/controllers/Jobs.js @@ -22,6 +22,17 @@ function JobsListCtrl ($scope, $rootScope, $location, $log, $routeParams, Rest, var scope = view.inject(list, { mode: 'edit' }); scope.selected = []; + if (scope.PostRefreshRemove) { + scope.PostRefreshRemove(); + } + scope.PostRefreshRemove = scope.$on('PostRefresh', function() { + $("tr.success").each(function(index) { + // Make sure no rows have a green background + var ngc = $(this).attr('ng-class'); + scope[ngc] = ""; + }); + }); + SearchInit({ scope: scope, set: 'jobs', list: list, url: defaultUrl }); PaginateInit({ scope: scope, list: list, url: defaultUrl }); scope.search(list.iterator); diff --git a/ansibleworks/ui/static/js/controllers/Organizations.js b/ansibleworks/ui/static/js/controllers/Organizations.js index 0e5b0c94d6..dce73783a0 100644 --- a/ansibleworks/ui/static/js/controllers/Organizations.js +++ b/ansibleworks/ui/static/js/controllers/Organizations.js @@ -28,6 +28,17 @@ function OrganizationsList ($scope, $rootScope, $location, $log, Rest, Alert, Lo LoadBreadCrumbs(); + if (scope.PostRefreshRemove) { + scope.PostRefreshRemove(); + } + scope.PostRefreshRemove = scope.$on('PostRefresh', function() { + $("tr.success").each(function(index) { + // Make sure no rows have a green background + var ngc = $(this).attr('ng-class'); + scope[ngc] = ""; + }); + }); + // Initialize search and paginate pieces and load data SearchInit({ scope: scope, set: list.name, list: list, url: defaultUrl }); PaginateInit({ scope: scope, list: list, url: defaultUrl }); diff --git a/ansibleworks/ui/static/js/controllers/Projects.js b/ansibleworks/ui/static/js/controllers/Projects.js index 83097b8a83..11be08e5d7 100644 --- a/ansibleworks/ui/static/js/controllers/Projects.js +++ b/ansibleworks/ui/static/js/controllers/Projects.js @@ -24,6 +24,17 @@ function ProjectsList ($scope, $rootScope, $location, $log, $routeParams, Rest, var scope = view.inject(list, { mode: mode }); scope.selected = []; + if (scope.PostRefreshRemove) { + scope.PostRefreshRemove(); + } + scope.PostRefreshRemove = scope.$on('PostRefresh', function() { + $("tr.success").each(function(index) { + // Make sure no rows have a green background + var ngc = $(this).attr('ng-class'); + scope[ngc] = ""; + }); + }); + SearchInit({ scope: scope, set: 'projects', list: list, url: defaultUrl }); PaginateInit({ scope: scope, list: list, url: defaultUrl }); scope.search(list.iterator); diff --git a/ansibleworks/ui/static/js/controllers/Teams.js b/ansibleworks/ui/static/js/controllers/Teams.js index d794a4f916..c3b1b86c0c 100644 --- a/ansibleworks/ui/static/js/controllers/Teams.js +++ b/ansibleworks/ui/static/js/controllers/Teams.js @@ -24,14 +24,20 @@ function TeamsList ($scope, $rootScope, $location, $log, $routeParams, Rest, Ale var scope = view.inject(list, { mode: mode }); // Inject our view scope.selected = []; - // After a refresh, populate the organization name on each row if (scope.PostRefreshRemove) { scope.PostRefreshRemove(); } scope.PostRefershRemove = scope.$on('PostRefresh', function() { + // After a refresh, populate the organization name on each row for( var i=0; i < scope.teams.length; i++) { scope.teams[i].organization_name = scope.teams[i].summary_fields.organization.name; } + + $("tr.success").each(function(index) { + // Make sure no rows have a green background + var ngc = $(this).attr('ng-class'); + scope[ngc] = ""; + }); }); //SetTeamListeners({ scope: scope, set: 'teams', iterator: list.iterator }); diff --git a/ansibleworks/ui/static/js/controllers/Users.js b/ansibleworks/ui/static/js/controllers/Users.js index 3318f4a523..650d94587a 100644 --- a/ansibleworks/ui/static/js/controllers/Users.js +++ b/ansibleworks/ui/static/js/controllers/Users.js @@ -24,6 +24,7 @@ function UsersList ($scope, $rootScope, $location, $log, $routeParams, Rest, var mode = (base == 'users') ? 'edit' : 'select'; // if base path 'users', we're here to add/edit users var scope = view.inject(UserList, { mode: mode }); // Inject our view scope.selected = []; + $rootScope.flashMessage = null; SearchInit({ scope: scope, set: 'users', list: list, url: defaultUrl }); PaginateInit({ scope: scope, list: list, url: defaultUrl }); diff --git a/ansibleworks/ui/static/js/helpers/Groups.js b/ansibleworks/ui/static/js/helpers/Groups.js index 8d30f35146..e9bd31c2fa 100644 --- a/ansibleworks/ui/static/js/helpers/Groups.js +++ b/ansibleworks/ui/static/js/helpers/Groups.js @@ -12,6 +12,7 @@ angular.module('GroupsHelper', [ 'RestServices', 'Utilities', 'ListGenerator', ' 'InventoryHelper' ]) + .factory('GroupsList', ['$rootScope', '$location', '$log', '$routeParams', 'Rest', 'Alert', 'GroupList', 'GenerateList', 'Prompt', 'SearchInit', 'PaginateInit', 'ProcessErrors', 'GetBasePath', 'GroupsAdd', 'RefreshTree', function($rootScope, $location, $log, $routeParams, Rest, Alert, GroupList, GenerateList, LoadBreadCrumbs, SearchInit, @@ -153,7 +154,6 @@ angular.module('GroupsHelper', [ 'RestServices', 'Utilities', 'ListGenerator', ' }]) - .factory('GroupsAdd', ['$rootScope', '$location', '$log', '$routeParams', 'Rest', 'Alert', 'GroupForm', 'GenerateForm', 'Prompt', 'ProcessErrors', 'GetBasePath', 'RefreshTree', function($rootScope, $location, $log, $routeParams, Rest, Alert, GroupForm, GenerateForm, Prompt, ProcessErrors, @@ -234,6 +234,7 @@ angular.module('GroupsHelper', [ 'RestServices', 'Utilities', 'ListGenerator', ' } }]) + .factory('GroupsEdit', ['$rootScope', '$location', '$log', '$routeParams', 'Rest', 'Alert', 'GroupForm', 'GenerateForm', 'Prompt', 'ProcessErrors', 'GetBasePath', 'RefreshTree', function($rootScope, $location, $log, $routeParams, Rest, Alert, GroupForm, GenerateForm, Prompt, ProcessErrors, diff --git a/ansibleworks/ui/static/js/helpers/refresh.js b/ansibleworks/ui/static/js/helpers/refresh.js index 6ce2eb1ccb..3f832c5011 100644 --- a/ansibleworks/ui/static/js/helpers/refresh.js +++ b/ansibleworks/ui/static/js/helpers/refresh.js @@ -22,6 +22,7 @@ angular.module('RefreshHelper', ['RestServices', 'Utilities']) var set = params.set; var iterator = params.iterator; var url = params.url; + Rest.setUrl(url); Rest.get() .success( function(data, status, headers, config) { diff --git a/ansibleworks/ui/static/lib/ansible/list-generator.js b/ansibleworks/ui/static/lib/ansible/list-generator.js index ef684b7027..e48fb639d7 100644 --- a/ansibleworks/ui/static/lib/ansible/list-generator.js +++ b/ansibleworks/ui/static/lib/ansible/list-generator.js @@ -91,7 +91,7 @@ angular.module('ListGenerator', ['GeneratorHelpers',]) this.scope.lookupHeader = options.hdr; $('#lookup-modal').modal(); } - + return this.scope; },