diff --git a/awx/ui/client/src/configuration/auth-form/configuration-auth.controller.js b/awx/ui/client/src/configuration/auth-form/configuration-auth.controller.js
index 9d450717f3..c38183599e 100644
--- a/awx/ui/client/src/configuration/auth-form/configuration-auth.controller.js
+++ b/awx/ui/client/src/configuration/auth-form/configuration-auth.controller.js
@@ -6,6 +6,7 @@
export default [
'$scope',
+ '$rootScope',
'$state',
'$stateParams',
'$timeout',
@@ -26,6 +27,7 @@ export default [
'ParseTypeChange',
function(
$scope,
+ $rootScope,
$state,
$stateParams,
$timeout,
@@ -138,7 +140,6 @@ export default [
}, ];
var forms = _.pluck(authForms, 'formDef');
-
_.each(forms, function(form) {
var keys = _.keys(form.fields);
_.each(keys, function(key) {
@@ -156,6 +157,8 @@ export default [
}
addFieldInfo(form, key);
});
+ // Disable the save button for non-superusers
+ form.buttons.save.disabled = 'vm.updateProhibited';
});
function addFieldInfo(form, key) {
@@ -167,7 +170,8 @@ export default [
dataPlacement: 'top',
placeholder: ConfigurationUtils.formatPlaceholder($scope.$parent.configDataResolve[key].placeholder, key) || null,
dataTitle: $scope.$parent.configDataResolve[key].label,
- required: $scope.$parent.configDataResolve[key].required
+ required: $scope.$parent.configDataResolve[key].required,
+ ngDisabled: $rootScope.user_is_system_auditor
});
}
diff --git a/awx/ui/client/src/configuration/configuration.block.less b/awx/ui/client/src/configuration/configuration.block.less
index edf80e01a8..de4dae2e2c 100644
--- a/awx/ui/client/src/configuration/configuration.block.less
+++ b/awx/ui/client/src/configuration/configuration.block.less
@@ -1,4 +1,5 @@
@import "./client/src/shared/branding/colors.default.less";
+@import "../shared/branding/colors.less";
.Form-resetValue, .Form-resetFile {
text-transform: uppercase;
@@ -49,3 +50,24 @@ input#filePickerText {
border-radius: 0 5px 5px 0;
background-color: #fff;
}
+
+// Messagebar for system auditor role notifications
+.Section-messageBar {
+ width: 120%;
+ margin-left: -20px;
+ padding: 10px;
+ color: @white;
+ background-color: @default-link;
+}
+
+.Section-messageBar--close {
+ position: absolute;
+ right: 0;
+ background: none;
+ border: none;
+ color: @info-close;
+}
+
+.Section-messageBar--close:hover {
+ color: @white;
+}
diff --git a/awx/ui/client/src/configuration/configuration.controller.js b/awx/ui/client/src/configuration/configuration.controller.js
index 5bc6ea6415..35d19a5611 100644
--- a/awx/ui/client/src/configuration/configuration.controller.js
+++ b/awx/ui/client/src/configuration/configuration.controller.js
@@ -362,6 +362,12 @@ export default [
$scope.toggleForm = function(key) {
+ if($rootScope.user_is_system_auditor) {
+ // Block system auditors from making changes
+ event.preventDefault();
+ return;
+ }
+
$scope[key] = !$scope[key];
Wait('start');
var payload = {};
@@ -425,16 +431,58 @@ export default [
triggerModal(msg, title, buttons);
};
+ var show_auditor_bar;
+ if($rootScope.user_is_system_auditor && Store('show_auditor_bar') !== false) {
+ show_auditor_bar = true;
+ } else {
+ show_auditor_bar = false;
+ }
+
+ var updateMessageBarPrefs = function() {
+ vm.show_auditor_bar = false;
+ Store('show_auditor_bar', vm.show_auditor_bar);
+ };
+
+ var closeMessageBar = function() {
+ var msg = 'Are you sure you want to hide the notification bar?';
+ var title = 'Warning: Closing notification bar';
+ var buttons = [{
+ label: "Cancel",
+ "class": "btn Form-cancelButton",
+ "id": "formmodal-cancel-button",
+ onClick: function() {
+ $('#FormModal-dialog').dialog('close');
+ }
+ }, {
+ label: "OK",
+ onClick: function() {
+ $('#FormModal-dialog').dialog('close');
+ updateMessageBarPrefs();
+ },
+ "class": "btn btn-primary",
+ "id": "formmodal-save-button"
+ }];
+ triggerModal(msg, title, buttons);
+ };
+
+ var updateProhibited = true;
+ if($rootScope.user_is_superuser) {
+ updateProhibited = false;
+ }
+
angular.extend(vm, {
activeTab: activeTab,
activeTabCheck: activeTabCheck,
+ closeMessageBar: closeMessageBar,
currentForm: currentForm,
formCancel: formCancel,
formTracker: formTracker,
formSave: formSave,
populateFromApi: populateFromApi,
resetAllConfirm: resetAllConfirm,
- triggerModal: triggerModal
+ show_auditor_bar: show_auditor_bar,
+ triggerModal: triggerModal,
+ updateProhibited: updateProhibited
});
}
];
diff --git a/awx/ui/client/src/configuration/configuration.partial.html b/awx/ui/client/src/configuration/configuration.partial.html
index 31a14d9e51..42beab808c 100644
--- a/awx/ui/client/src/configuration/configuration.partial.html
+++ b/awx/ui/client/src/configuration/configuration.partial.html
@@ -1,3 +1,9 @@
+
+
+ System auditors have read-only permissions in this section.
+
+
+