diff --git a/awx/ui/static/js/controllers/Inventories.js b/awx/ui/static/js/controllers/Inventories.js index b246c09625..43b01c62e2 100644 --- a/awx/ui/static/js/controllers/Inventories.js +++ b/awx/ui/static/js/controllers/Inventories.js @@ -1186,7 +1186,7 @@ export function InventoriesManage ($log, $scope, $rootScope, $location, // if no source, do nothing. } else if (group.status === 'updating') { Alert('Update in Progress', 'The inventory update process is currently running for group ' + - group.name + ' Click the button to monitor the status.', 'alert-info'); + group.name + ' Click the button to monitor the status.', 'alert-info', null, null, null, null, true); } else { Wait('start'); Rest.setUrl(group.related.inventory_source); diff --git a/awx/ui/static/js/controllers/JobTemplates.js b/awx/ui/static/js/controllers/JobTemplates.js index f2954baf4e..c83654aa71 100644 --- a/awx/ui/static/js/controllers/JobTemplates.js +++ b/awx/ui/static/js/controllers/JobTemplates.js @@ -788,7 +788,7 @@ export function JobTemplatesEdit($filter, $scope, $rootScope, $compile, $locatio } Wait('stop'); if (msg) { - Alert('Warning', msg, 'alert-info'); + Alert('Warning', msg, 'alert-info', null, null, null, null, true); } }) .error(function (data, status) { diff --git a/awx/ui/static/js/controllers/Projects.js b/awx/ui/static/js/controllers/Projects.js index a290291795..281d6bb0ad 100644 --- a/awx/ui/static/js/controllers/Projects.js +++ b/awx/ui/static/js/controllers/Projects.js @@ -300,7 +300,7 @@ export function ProjectsList ($scope, $rootScope, $location, $log, $routeParams, $scope.$emit('Cancel_Update', url); } else { Alert('Cancel Not Allowed', 'Either you do not have access or the SCM update process completed. ' + - 'Click the Refresh button to view the latest status.', 'alert-info'); + 'Click the Refresh button to view the latest status.', 'alert-info', null, null, null, null, true); } }) .error(function (data, status) { diff --git a/awx/ui/static/js/helpers/Groups.js b/awx/ui/static/js/helpers/Groups.js index 499d548346..babff31306 100644 --- a/awx/ui/static/js/helpers/Groups.js +++ b/awx/ui/static/js/helpers/Groups.js @@ -87,7 +87,7 @@ angular.module('GroupsHelper', [ 'RestServices', 'Utilities', listGenerator.name // do nothing } else if (Empty(group.status) || group.status === "never updated") { Alert('No Status Available', 'An inventory sync has not been performed for the selected group. Start the process by ' + - 'clicking the button.', 'alert-info'); + 'clicking the button.', 'alert-info', null, null, null, null, true); } else { Wait('start'); Rest.setUrl(group.related.inventory_source); @@ -703,11 +703,11 @@ angular.module('GroupsHelper', [ 'RestServices', 'Utilities', listGenerator.name * TODO: Document * */ -.factory('GroupsEdit', ['$rootScope', '$location', '$log', '$routeParams', '$compile', 'Rest', 'Alert', 'GroupForm', 'GenerateForm', +.factory('GroupsEdit', ['$filter', '$rootScope', '$location', '$log', '$routeParams', '$compile', 'Rest', 'Alert', 'GroupForm', 'GenerateForm', 'Prompt', 'ProcessErrors', 'GetBasePath', 'SetNodeName', 'ParseTypeChange', 'GetSourceTypeOptions', 'InventoryUpdate', 'LookUpInit', 'Empty', 'Wait', 'GetChoices', 'UpdateGroup', 'SourceChange', 'Find', 'ParseVariableString', 'ToJSON', 'GroupsScheduleListInit', 'SourceForm', 'SetSchedulesInnerDialogSize', 'CreateSelect2', - function ($rootScope, $location, $log, $routeParams, $compile, Rest, Alert, GroupForm, GenerateForm, Prompt, ProcessErrors, + function ($filter, $rootScope, $location, $log, $routeParams, $compile, Rest, Alert, GroupForm, GenerateForm, Prompt, ProcessErrors, GetBasePath, SetNodeName, ParseTypeChange, GetSourceTypeOptions, InventoryUpdate, LookUpInit, Empty, Wait, GetChoices, UpdateGroup, SourceChange, Find, ParseVariableString, ToJSON, GroupsScheduleListInit, SourceForm, SetSchedulesInnerDialogSize, CreateSelect2) { @@ -1438,7 +1438,7 @@ angular.module('GroupsHelper', [ 'RestServices', 'Utilities', listGenerator.name 'and then run an update.', 'alert-info'); } else if (sources_scope.status === 'updating') { Alert('Update in Progress', 'The inventory update process is currently running for group ' + - sources_scope.summary_fields.group.name + '. Use the Refresh button to monitor the status.', 'alert-info'); + $filter('sanitize')(sources_scope.summary_fields.group.name) + '. Use the Refresh button to monitor the status.', 'alert-info', null, null, null, null, true); } else { InventoryUpdate({ scope: parent_scope, diff --git a/awx/ui/static/js/helpers/JobSubmission.js b/awx/ui/static/js/helpers/JobSubmission.js index b5967c6dd1..820e23be7a 100644 --- a/awx/ui/static/js/helpers/JobSubmission.js +++ b/awx/ui/static/js/helpers/JobSubmission.js @@ -962,7 +962,7 @@ function($compile, Rest, GetBasePath, TextareaResize,CreateDialog, GenerateForm, } if (scope.socketStatus === 'error') { Alert('Update Started', 'The request to start the SCM update process was submitted. ' + - 'To monitor the update status, refresh the page by clicking the button.', 'alert-info'); + 'To monitor the update status, refresh the page by clicking the button.', 'alert-info', null, null, null, null, true); if (scope.refresh) { scope.refresh(); }