External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-09-15 08:20:10 -02:30
Code Issues Packages Projects Releases Wiki Activity
7,995 Commits 63 Branches 102 Tags
6a0ef366f3f4dde005c55152a189bfb0805340d8
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Wayne Witzel III 3cf4d1feb8 Fixing Credential access issue 2016-06-10 10:30:22 -04:00
Wayne Witzel III 73acf006cf Merge pull request #2282 from wwitzel3/cred-owners 
add credential owner endpoints
 2016-06-09 12:01:09 -07:00
Wayne Witzel III 698085353b addressing review comments 2016-06-09 14:47:54 -04:00
Wayne Witzel III ccc510110d add credential owner endpoints 2016-06-09 14:41:35 -04:00
Wayne Witzel III 61fb16b8c1 Merge pull request #2222 from wwitzel3/release_3.0.0 
CredentialAccess should check for the owner_role earlier
 2016-06-08 06:11:07 -07:00
Wayne Witzel III 1fb4a68047 CredentialAccess should check for the owner_role earlier 2016-06-08 04:23:29 -04:00
Wayne Witzel III 6cc2e05ddf Merge pull request #2192 from wwitzel3/release_3.0.0 
combining job_template api tests
 2016-06-07 08:10:21 -07:00
Wayne Witzel III 112d271ccb combining job_template api tests 2016-06-07 10:13:51 -04:00
Wayne Witzel III e002062242 Merge pull request #2176 from wwitzel3/release_3.0.0 
refactoring survey spec tests and fixtures
 2016-06-06 11:17:04 -07:00
Wayne Witzel III 8f3c0ff884 refactoring survey spec tests and fixtures 2016-06-06 13:39:25 -04:00
Wayne Witzel III 7395e07221 Merge pull request #2068 from wwitzel3/issue_3.0_1990 
Fix ActivityStream when object2 is a role.
 2016-05-27 15:45:53 -04:00
Wayne Witzel III 31d3e3ec55 mock activity stream license and make query more specific 2016-05-27 15:21:24 -04:00
Wayne Witzel III 995a060bb1 Merge pull request #2078 from wwitzel3/issue_3.0_1882 
add test for job_template role assignment for users
 2016-05-26 15:57:10 -04:00
Wayne Witzel III 61208f6a77 content_object can be None, that is what we care about 2016-05-26 15:45:16 -04:00
Wayne Witzel III e6c76d0941 fixup objects creation helpers 2016-05-26 15:45:14 -04:00
Wayne Witzel III 2e0686a173 tests for object2 type when it is a role 2016-05-26 15:45:12 -04:00
Wayne Witzel III 13f0b440c3 discover content type when object2 is a role 2016-05-26 15:45:10 -04:00
Wayne Witzel III db93fdab4a exercise role signal for job_template type 2016-05-26 15:26:55 -04:00
Wayne Witzel III b8865c3749 make arguments to mk_ methods explicit 2016-05-26 11:02:09 -04:00
Wayne Witzel III ec505f3f60 adjusting test and renaming helper 2016-05-26 11:02:07 -04:00
Wayne Witzel III a6e97626ba README updates 2016-05-26 11:02:05 -04:00
Wayne Witzel III 1189ce033a fixing broken test cases 2016-05-26 11:02:04 -04:00
Wayne Witzel III 2052f93792 fixing function calls and None handling 2016-05-26 11:02:02 -04:00
Wayne Witzel III c514cd44c3 restructure factories/fixtures and fix tests 2016-05-26 11:01:58 -04:00
Wayne Witzel III fa010c2228 fix mk_label method 2016-05-26 11:01:57 -04:00
Wayne Witzel III aaabc2582d refactored roles handling and added some more tests 2016-05-26 11:01:55 -04:00
Wayne Witzel III 4453e48729 updated factories docs 2016-05-26 11:01:53 -04:00
Wayne Witzel III 73e41ef6cc flake8 fixes 2016-05-26 11:01:52 -04:00
Wayne Witzel III 2f09c7fee1 added test for factory roles 2016-05-26 11:01:50 -04:00
Wayne Witzel III 3877804599 updated test to use new organization_factory 2016-05-26 11:01:48 -04:00
Wayne Witzel III 7ab385524d added roles support for organization_factory 2016-05-26 11:01:46 -04:00
Wayne Witzel III becce311fe cleanup make methods and update asserts 2016-05-26 11:01:44 -04:00
Wayne Witzel III bcef4a698c updating some tests to use new factories 2016-05-26 11:01:41 -04:00
Wayne Witzel III 0516ef02ca adding new factories 2016-05-26 11:01:39 -04:00
Wayne Witzel III 4b95e5db8d ensure superusers can still see JTs even if proj/inv/org are deleted 2016-05-18 15:31:48 -04:00
Wayne Witzel III 1810e80203 pep8 fixups, unused imports 2016-05-18 15:29:13 -04:00
Wayne Witzel III c99e4ea398 remove copy/paste .all() from Role get_queryset implementations 2016-05-18 15:23:41 -04:00
Wayne Witzel III cce7af3d19 adds related roles for InventoryScript 2016-05-18 14:21:30 -04:00
Wayne Witzel III f00825ecf0 removed OR test, removed that functionality 2016-05-18 14:08:15 -04:00
Wayne Witzel III 4395f3945c Merge pull request #1945 from wwitzel3/issue-1936 
move related roles UnifiedJobTemplate -> JobTemplate
 2016-05-18 10:22:08 -04:00
Wayne Witzel III 2e4c26a77f remove the ORing of local roles, check against organization roles 2016-05-17 13:56:11 -04:00
Wayne Witzel III ddc8f73b63 move related roles UnifiedJobTemplate -> JobTemplate 2016-05-17 11:29:26 -04:00
Wayne Witzel III 1e16482809 Merge pull request #1913 from wwitzel3/issue-1884 
Consolidate roles and re-structure auditor children.
 2016-05-13 13:11:14 -04:00
Wayne Witzel III 599902da47 update api view/serializers for new role names 2016-05-13 12:00:33 -04:00
Wayne Witzel III da12da2a05 test fixes for new role names 2016-05-13 11:59:18 -04:00
Wayne Witzel III 911c92707c update models to match new migrations 2016-05-13 11:59:14 -04:00
Wayne Witzel III 6a6194cc43 update migrations for RBAC 2016-05-13 11:59:12 -04:00
Wayne Witzel III 1da2727f5d add can_admin for CustomInventoryScripts 2016-05-13 11:59:05 -04:00
Wayne Witzel III 542d3d22b2 Merge pull request #1889 from wwitzel3/issue-1881 
remove URL and add roles endpoint for JobTemplate
 2016-05-13 09:16:37 -04:00
Wayne Witzel III 0ef456e4d8 added related Roles to Project, Credential, Inventory, and Group 2016-05-12 10:05:46 -04:00
Wayne Witzel III f12c6530cf fix rbac summary_fields test 2016-05-11 11:41:53 -04:00
Wayne Witzel III 6a5f4d6113 remove URL and add roles endpoint for JobTemplate 2016-05-10 16:29:11 -04:00
Wayne Witzel III ba1e4cb19a Merge pull request #1878 from wwitzel3/test-refactors 
Refactoring /old tests to use py.test
 2016-05-10 15:58:22 -04:00
Wayne Witzel III 2c0c8591df refactor old remove_instance tests 2016-05-10 11:42:54 -04:00
Wayne Witzel III 102b8a4f91 refector old update_password tests 2016-05-10 10:37:20 -04:00
Wayne Witzel III 84c326d801 Merge pull request #1865 from wwitzel3/issue-1567 
add count to labels
 2016-05-09 15:05:17 -04:00
Wayne Witzel III afe5f5ebc0 add count to labels 2016-05-09 14:29:08 -04:00
Wayne Witzel III c050750489 Merge pull request #1834 from wwitzel3/issue-752 
add owners summary_field for Credential
 2016-05-06 21:58:47 -04:00
Wayne Witzel III e6210de7b2 fix related fields to include team and user 2016-05-06 15:21:23 -04:00
Wayne Witzel III 963ce41851 fix credential details test 2016-05-06 15:11:28 -04:00
Wayne Witzel III dc9b609655 add owners summary_field for Credential 2016-05-06 11:49:24 -04:00
Wayne Witzel III 102c6940cb Merge pull request #1814 from wwitzel3/issue-1772 
No longer attempt to serialize old permission data.
 2016-05-04 17:28:56 -04:00
Wayne Witzel III 082ca59812 Fixing missed test from period all the things update 2016-05-04 17:12:51 -04:00
Wayne Witzel III c4ffab8a3e Attempted fix of issue 1772 2016-05-04 15:31:37 -04:00
Wayne Witzel III 1b9561bc42 Merge pull request #1789 from wwitzel3/issue-1427 
Ensure access_list returns a 404 when object is not found
 2016-05-03 15:54:34 -04:00
Wayne Witzel III a710f2d2cd Ensure access_list returns a 404 when object is not found 2016-05-03 15:01:23 -04:00
Wayne Witzel III 5291420a17 Merge pull request #1771 from wwitzel3/issue-1608 
Implement ActivityStream for RBAC Roles
 2016-05-03 14:30:50 -04:00
Wayne Witzel III 65f71ba2ab Fixing issue when Role is not associated with a Resource (generally never) 2016-05-03 13:32:40 -04:00
Wayne Witzel III f60ce147f4 Add role to summarizable fields 2016-05-03 12:06:17 -04:00
Wayne Witzel III b78c3a3e61 Fix error when adding roles from the User.roles side 2016-05-03 11:55:40 -04:00
Wayne Witzel III 453a0aaff2 Implement ActivityStream for RBAC Roles 2016-05-03 10:16:04 -04:00
Wayne Witzel III 573bc07c5d Merge pull request #1738 from wwitzel3/issue-1714 
prevent a user from removing their own admin_role
 2016-05-02 10:09:41 -04:00
Wayne Witzel III 18e42d442e Merge pull request #1734 from wwitzel3/team-roles-access 
ensure change access for adding team roles
 2016-05-02 10:09:08 -04:00
Wayne Witzel III 86ea6b115f Merge pull request #1739 from wwitzel3/issue-1531 
fixing non-unique query combining
 2016-05-02 10:08:18 -04:00
Wayne Witzel III 47561978d2 fixing non-unique query combining 2016-04-28 16:11:12 -04:00
Wayne Witzel III 1e432126cd prevent a user from removing their own admin_role 2016-04-28 15:39:56 -04:00
Wayne Witzel III ef8eb712c6 added tests to assert team roles attach/unattach permissions, removed previous flawed fix 2016-04-28 15:15:26 -04:00
Wayne Witzel III b6bbd4fa77 ensure change access for adding team roles 2016-04-28 13:43:49 -04:00
Wayne Witzel III 7e482cdb36 Merge pull request #1719 from wwitzel3/issue-1699 
change inventory error warning
 2016-04-27 16:44:21 -04:00
Wayne Witzel III 78148da55c change inventory error warning 2016-04-27 16:31:03 -04:00
Wayne Witzel III d418a09bfc Merge pull request #1700 from wwitzel3/issue-1429 
Fixing CredentialList post access check
 2016-04-27 09:10:26 -04:00
Wayne Witzel III e78eb591db change permission, not admin permission 2016-04-26 15:57:49 -04:00
Wayne Witzel III 2b589228d3 Fixing CredentialList post access check 2016-04-26 14:36:22 -04:00
Wayne Witzel III f457e54a23 Merge pull request #1672 from wwitzel3/devel 
adjusting how we restrict __in based on PR feedback
 2016-04-25 09:31:18 -04:00
Wayne Witzel III b6b02bee99 adjusting how we restrict __in based on PR feedback 2016-04-22 17:54:44 -04:00
Wayne Witzel III 334f303a6f Merge pull request #1666 from wwitzel3/issue-1652 
do not allow requests with empty values in __in values
 2016-04-22 16:06:41 -04:00
Wayne Witzel III 2a03556729 Merge pull request #1653 from wwitzel3/issue-1482 
update Access methods for superuser
 2016-04-22 16:06:14 -04:00
Wayne Witzel III 2cf11b9fe3 Merge pull request #1667 from wwitzel3/issue-1622 
Host is not a Resource, access is granted indirectly through Inventory
 2016-04-22 16:02:04 -04:00
Wayne Witzel III 697f97972f Host is not a Resource, access is granted indirectly through Inventory 2016-04-22 15:51:18 -04:00
Wayne Witzel III 4ef291b00b do not allow requests with empty values in __in values 2016-04-22 15:39:33 -04:00
Wayne Witzel III 8f9fe93de5 Merge pull request #1657 from wwitzel3/issue-1108 
updating requests version
 2016-04-22 12:08:56 -04:00
Wayne Witzel III f0b4e18159 updating requests version 2016-04-22 12:07:34 -04:00
Wayne Witzel III 1adbcc03d0 update Access methods for superuser 2016-04-22 11:28:19 -04:00
Wayne Witzel III f7f4bfb289 Merge pull request #1651 from wwitzel3/devel 
fixing broken JT migration
 2016-04-22 10:06:52 -04:00
Wayne Witzel III b045a94767 fixing broken JT migration 2016-04-22 10:06:28 -04:00
Wayne Witzel III efebb3701b Merge pull request #1639 from wwitzel3/bug-1428 
Add parent ORing for Role field, renamed permissions -> active_roles
 2016-04-21 16:27:56 -04:00
Wayne Witzel III 8574a3080f update tests and adjust rbac migration 2016-04-21 16:03:49 -04:00
Wayne Witzel III 0309757439 Add parent ORing for Role field, renamed permissions -> active_roles 2016-04-21 15:54:36 -04:00
Wayne Witzel III 2f9e1be348 Merge pull request #1610 from wwitzel3/bug-1609 
added region choice placeholders for Sat6/CloudForms
 2016-04-20 09:44:36 -04:00
Wayne Witzel III fe75d164a7 added region choice placeholders for Sat6/CloudForms 2016-04-20 09:43:31 -04:00