Only allow user with super_user access to see activity stream button. Fixed collision between is_superuser rootscope variable and credential.is_superuser on credential detail page. Added AS to user/n/permissions page.

2026-03-26 13:25:02 -02:30 · 2013-11-19 20:39:28 +00:00
parent e2e8a7e346
commit 94bbab566b
26 changed files with 79 additions and 24 deletions
--- a/awx/ui/static/js/lists/Credentials.js
+++ b/awx/ui/static/js/lists/Credentials.js
@@ -69,7 +69,8 @@ angular.module('CredentialsListDefinition', [])
                dataPlacement: "top",
                icon: "icon-comments-alt",
                mode: 'all',
-                iconSize: 'large'
+                iconSize: 'large',
+                ngShow: "user_is_superuser"
                }
            },

--- a/awx/ui/static/js/lists/HomeGroups.js
+++ b/awx/ui/static/js/lists/HomeGroups.js
@@ -117,7 +117,8 @@ angular.module('HomeGroupListDefinition', [])
                dataPlacement: "top",
                icon: "icon-comments-alt",
                mode: 'all',
-                iconSize: 'large'
+                iconSize: 'large',
+                ngShow: "user_is_superuser"
                }
            },

--- a/awx/ui/static/js/lists/HomeHosts.js
+++ b/awx/ui/static/js/lists/HomeHosts.js
@@ -88,7 +88,8 @@ angular.module('HomeHostListDefinition', [])
                dataPlacement: "top",
                icon: "icon-comments-alt",
                mode: 'all',
-                iconSize: 'large'
+                iconSize: 'large',
+                ngShow: "user_is_superuser"
                }
            },

--- a/awx/ui/static/js/lists/Inventories.js
+++ b/awx/ui/static/js/lists/Inventories.js
@@ -96,7 +96,8 @@ angular.module('InventoriesListDefinition', [])
                dataPlacement: "top",
                icon: "icon-comments-alt",
                mode: 'all',
-                iconSize: 'large'
+                iconSize: 'large',
+                ngShow: "user_is_superuser"
                }
            },

--- a/awx/ui/static/js/lists/InventorySummary.js
+++ b/awx/ui/static/js/lists/InventorySummary.js
@@ -143,7 +143,8 @@ angular.module('InventorySummaryDefinition', [])
                dataPlacement: "top",
                icon: "icon-comments-alt",
                mode: 'all',
-                iconSize: 'large'
+                iconSize: 'large',
+                ngShow: "user_is_superuser"
                }
            },

--- a/awx/ui/static/js/lists/JobTemplates.js
+++ b/awx/ui/static/js/lists/JobTemplates.js
@@ -45,7 +45,8 @@ angular.module('JobTemplatesListDefinition', [])
                dataPlacement: "top",
                icon: "icon-comments-alt",
                mode: 'all',
-                iconSize: 'large'
+                iconSize: 'large',
+                ngShow: "user_is_superuser"
                }
            },

--- a/awx/ui/static/js/lists/Organizations.js
+++ b/awx/ui/static/js/lists/Organizations.js
@@ -52,7 +52,8 @@ angular.module('OrganizationListDefinition', [])
                dataPlacement: "top",
                icon: "icon-comments-alt",
                mode: 'all',
-                iconSize: 'large'
+                iconSize: 'large',
+                ngShow: "user_is_superuser"
                }
            },

--- a/awx/ui/static/js/lists/Permissions.js
+++ b/awx/ui/static/js/lists/Permissions.js
@@ -50,6 +50,16 @@ angular.module('PermissionListDefinition', [])
                "class": 'btn-success btn-xs',
                awToolTip: 'Add a new permission',
                ngShow: 'PermissionAddAllowed'
+                },
+            stream: {
+                'class': "btn-primary btn-xs activity-btn",
+                ngClick: "showActivity()",
+                awToolTip: "View Activity Stream",
+                dataPlacement: "top",
+                icon: "icon-comments-alt",
+                mode: 'all',
+                iconSize: 'large',
+                ngShow: "user_is_superuser"
                }
            },

--- a/awx/ui/static/js/lists/Projects.js
+++ b/awx/ui/static/js/lists/Projects.js
@@ -88,7 +88,8 @@ angular.module('ProjectsListDefinition', [])
                dataPlacement: "top",
                icon: "icon-comments-alt",
                mode: 'all',
-                iconSize: 'large'
+                iconSize: 'large',
+                ngShow: "user_is_superuser"
                }
            },

--- a/awx/ui/static/js/lists/Teams.js
+++ b/awx/ui/static/js/lists/Teams.js
@@ -50,7 +50,8 @@ angular.module('TeamsListDefinition', [])
                dataPlacement: "top",
                icon: "icon-comments-alt",
                mode: 'all',
-                iconSize: 'large'
+                iconSize: 'large',
+                ngShow: "user_is_superuser"
                }
            },

--- a/awx/ui/static/js/lists/Users.js
+++ b/awx/ui/static/js/lists/Users.js
@@ -50,7 +50,8 @@ angular.module('UserListDefinition', [])
                dataPlacement: "top",
                icon: "icon-comments-alt",
                mode: 'all',
-                iconSize: 'large'
+                iconSize: 'large',
+                ngShow: "user_is_superuser"
                }
            },