Allow system auditor to access the configure tower page. Hide revert all button for system auditors.

2026-03-01 08:48:46 -03:30 · 2017-07-19 14:01:59 -04:00
parent 4725eae48f
commit 3d935d2448
15 changed files with 15 additions and 2 deletions
--- a/awx/ui/client/src/configuration/auth-form/sub-forms/auth-azure.form.js
+++ b/awx/ui/client/src/configuration/auth-form/sub-forms/auth-azure.form.js
@@ -42,6 +42,7 @@

         buttons: {
             reset: {
+                 ngShow: '!user_is_system_auditor',
                 ngClick: 'vm.resetAllConfirm()',
                 label: i18n._('Revert all to default'),
                 class: 'Form-resetAll'
--- a/awx/ui/client/src/configuration/auth-form/sub-forms/auth-github-org.form.js
+++ b/awx/ui/client/src/configuration/auth-form/sub-forms/auth-github-org.form.js
@@ -46,6 +46,7 @@ export default ['i18n', function(i18n) {

        buttons: {
            reset: {
+                ngShow: '!user_is_system_auditor',
                ngClick: 'vm.resetAllConfirm()',
                label: i18n._('Revert all to default'),
                class: 'Form-resetAll'
--- a/awx/ui/client/src/configuration/auth-form/sub-forms/auth-github-team.form.js
+++ b/awx/ui/client/src/configuration/auth-form/sub-forms/auth-github-team.form.js
@@ -46,6 +46,7 @@ export default ['i18n', function(i18n) {

        buttons: {
            reset: {
+                ngShow: '!user_is_system_auditor',
                ngClick: 'vm.resetAllConfirm()',
                label: i18n._('Revert all to default'),
                class: 'Form-resetAll'
--- a/awx/ui/client/src/configuration/auth-form/sub-forms/auth-github.form.js
+++ b/awx/ui/client/src/configuration/auth-form/sub-forms/auth-github.form.js
@@ -42,6 +42,7 @@ export default ['i18n', function(i18n) {

        buttons: {
            reset: {
+                ngShow: '!user_is_system_auditor',
                ngClick: 'vm.resetAllConfirm()',
                label: i18n._('Revert all to default'),
                class: 'Form-resetAll'
--- a/awx/ui/client/src/configuration/auth-form/sub-forms/auth-google-oauth2.form.js
+++ b/awx/ui/client/src/configuration/auth-form/sub-forms/auth-google-oauth2.form.js
@@ -54,6 +54,7 @@ export default ['i18n', function(i18n) {

        buttons: {
            reset: {
+                ngShow: '!user_is_system_auditor',
                ngClick: 'vm.resetAllConfirm()',
                label: i18n._('Revert all to default'),
                class: 'Form-resetAll'
--- a/awx/ui/client/src/configuration/auth-form/sub-forms/auth-ldap.form.js
+++ b/awx/ui/client/src/configuration/auth-form/sub-forms/auth-ldap.form.js
@@ -90,6 +90,7 @@ export default ['i18n', function(i18n) {

        buttons: {
            reset: {
+                ngShow: '!user_is_system_auditor',
                ngClick: 'vm.resetAllConfirm()',
                label: i18n._('Revert all to default'),
                class: 'Form-resetAll'
--- a/awx/ui/client/src/configuration/auth-form/sub-forms/auth-radius.form.js
+++ b/awx/ui/client/src/configuration/auth-form/sub-forms/auth-radius.form.js
@@ -29,6 +29,7 @@ export default ['i18n', function(i18n) {

        buttons: {
            reset: {
+                ngShow: '!user_is_system_auditor',
                ngClick: 'vm.resetAllConfirm()',
                label: i18n._('Revert all to default'),
                class: 'Form-resetAll'
--- a/awx/ui/client/src/configuration/auth-form/sub-forms/auth-saml.form.js
+++ b/awx/ui/client/src/configuration/auth-form/sub-forms/auth-saml.form.js
@@ -82,6 +82,7 @@ export default ['i18n', function(i18n) {

        buttons: {
            reset: {
+                ngShow: '!user_is_system_auditor',
                ngClick: 'vm.resetAllConfirm()',
                label: i18n._('Revert all to default'),
                class: 'Form-resetAll'
--- a/awx/ui/client/src/configuration/auth-form/sub-forms/auth-tacacs.form.js
+++ b/awx/ui/client/src/configuration/auth-form/sub-forms/auth-tacacs.form.js
@@ -42,6 +42,7 @@ export default ['i18n', function(i18n) {

        buttons: {
            reset: {
+                ngShow: '!user_is_system_auditor',
                ngClick: 'vm.resetAllConfirm()',
                label: i18n._('Revert all to default'),
                class: 'Form-resetAll'
--- a/awx/ui/client/src/configuration/configuration.service.js
+++ b/awx/ui/client/src/configuration/configuration.service.js
@@ -23,7 +23,7 @@ export default ['$rootScope', 'GetBasePath', 'ProcessErrors', '$q', '$http', 'Re
                        var putActions = data.actions.PUT;

                        _.each(getKeys, function(key) {
-                            if(putActions[key]) {
+                            if(putActions && putActions[key]) {
                                returnData[key] = putActions[key];
                            } else {
                                returnData[key] = _.extend(getActions[key], {
--- a/awx/ui/client/src/configuration/jobs-form/configuration-jobs.form.js
+++ b/awx/ui/client/src/configuration/jobs-form/configuration-jobs.form.js
@@ -68,6 +68,7 @@ export default ['i18n', function(i18n) {
        },
        buttons: {
            reset: {
+                ngShow: '!user_is_system_auditor',
                ngClick: 'vm.resetAllConfirm()',
                label: i18n._('Revert all to default'),
                class: 'Form-resetAll'
@@ -82,4 +83,3 @@ export default ['i18n', function(i18n) {
        }
    };
 }];
-
--- a/awx/ui/client/src/configuration/system-form/sub-forms/system-activity-stream.form.js
+++ b/awx/ui/client/src/configuration/system-form/sub-forms/system-activity-stream.form.js
@@ -21,6 +21,7 @@

         buttons: {
             reset: {
+                 ngShow: '!user_is_system_auditor',
                 ngClick: 'vm.resetAllConfirm()',
                 label: i18n._('Revert all to default'),
                 class: 'Form-resetAll'
--- a/awx/ui/client/src/configuration/system-form/sub-forms/system-logging.form.js
+++ b/awx/ui/client/src/configuration/system-form/sub-forms/system-logging.form.js
@@ -68,6 +68,7 @@

         buttons: {
             reset: {
+                 ngShow: '!user_is_system_auditor',
                 ngClick: 'vm.resetAllConfirm()',
                 label: i18n._('Revert all to default'),
                 class: 'Form-resetAll'
--- a/awx/ui/client/src/configuration/system-form/sub-forms/system-misc.form.js
+++ b/awx/ui/client/src/configuration/system-form/sub-forms/system-misc.form.js
@@ -45,6 +45,7 @@ export default ['i18n', function(i18n) {

        buttons: {
            reset: {
+                ngShow: '!user_is_system_auditor',
                ngClick: 'vm.resetAllConfirm()',
                label: i18n._('Revert all to default'),
                class: 'Form-resetAll'
--- a/awx/ui/client/src/configuration/ui-form/configuration-ui.form.js
+++ b/awx/ui/client/src/configuration/ui-form/configuration-ui.form.js
@@ -31,6 +31,7 @@ export default ['i18n', function(i18n) {

        buttons: {
            reset: {
+                ngShow: '!user_is_system_auditor',
                ngClick: 'vm.resetAllConfirm()',
                label: i18n._('Revert all to default'),
                class: 'Form-resetAll'