From 3d935d24484f16dc0fcfea3818fb4ea1e00e1e3f Mon Sep 17 00:00:00 2001
From: Michael Abashian <mabashian@ansible.com>
Date: Wed, 19 Jul 2017 14:01:59 -0400
Subject: [PATCH] Allow system auditor to access the configure tower page. 
 Hide revert all button for system auditors.

---
 .../src/configuration/auth-form/sub-forms/auth-azure.form.js    | 1 +
 .../configuration/auth-form/sub-forms/auth-github-org.form.js   | 1 +
 .../configuration/auth-form/sub-forms/auth-github-team.form.js  | 1 +
 .../src/configuration/auth-form/sub-forms/auth-github.form.js   | 1 +
 .../auth-form/sub-forms/auth-google-oauth2.form.js              | 1 +
 .../src/configuration/auth-form/sub-forms/auth-ldap.form.js     | 1 +
 .../src/configuration/auth-form/sub-forms/auth-radius.form.js   | 1 +
 .../src/configuration/auth-form/sub-forms/auth-saml.form.js     | 1 +
 .../src/configuration/auth-form/sub-forms/auth-tacacs.form.js   | 1 +
 awx/ui/client/src/configuration/configuration.service.js        | 2 +-
 .../src/configuration/jobs-form/configuration-jobs.form.js      | 2 +-
 .../system-form/sub-forms/system-activity-stream.form.js        | 1 +
 .../configuration/system-form/sub-forms/system-logging.form.js  | 1 +
 .../src/configuration/system-form/sub-forms/system-misc.form.js | 1 +
 .../client/src/configuration/ui-form/configuration-ui.form.js   | 1 +
 15 files changed, 15 insertions(+), 2 deletions(-)

diff --git 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
index 95caa48439..e4e8a99ba2 100644
--- 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'
diff --git 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
index 5f29da4924..5087081254 100644
--- 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'
diff --git 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
index 959d4ae14d..01fab7193d 100644
--- 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'
diff --git 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
index 8b7b8dbc6a..2f13957cb4 100644
--- 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'
diff --git 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
index 3546fdbc3e..31986685ea 100644
--- 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'
diff --git 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
index 96b3f2a55e..6bd55b801f 100644
--- 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'
diff --git 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
index 1e70fca7bb..333d5be2c3 100644
--- 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'
diff --git 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
index 4273b1fc8b..08dd556ba3 100644
--- 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'
diff --git 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
index c5e29686e0..d236b5f0cf 100644
--- 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'
diff --git a/awx/ui/client/src/configuration/configuration.service.js b/awx/ui/client/src/configuration/configuration.service.js
index f5e14c828e..a26b0996a4 100644
--- 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], {
diff --git a/awx/ui/client/src/configuration/jobs-form/configuration-jobs.form.js b/awx/ui/client/src/configuration/jobs-form/configuration-jobs.form.js
index caa4d522a9..b945d44f44 100644
--- 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) {
         }
     };
 }];
-
diff --git 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
index 3dc7fd89f7..2cc39299ef 100644
--- 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'
diff --git 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
index b79065349c..ac585102bc 100644
--- 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'
diff --git 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
index 2e9e2cc79e..04ca0d03d5 100644
--- 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'
diff --git a/awx/ui/client/src/configuration/ui-form/configuration-ui.form.js b/awx/ui/client/src/configuration/ui-form/configuration-ui.form.js
index e566c076d1..4bb9fd3401 100644
--- 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'