1
0
mirror of https://github.com/ansible/awx.git synced 2024-11-01 08:21:15 +03:00
Commit Graph

6574 Commits

Author SHA1 Message Date
Akita Noek
c308c07579 Removed Permission reference in the activity stream query 2016-03-16 11:37:21 -04:00
Akita Noek
598d5ba5ef Fixed up JobAccess.get_queryset to use new RBAC system 2016-03-16 11:36:19 -04:00
Akita Noek
8d439c9468 Fixed up AdHocCommandAccess to not use old Permission query 2016-03-16 11:21:19 -04:00
Akita Noek
60fcbd78f1 Another users -> members_role.members fix 2016-03-16 10:54:35 -04:00
Akita Noek
65719615c4 Team users list update for .users -> .member_role.members 2016-03-16 10:40:31 -04:00
Akita Noek
460a14705a Updated the org users and org admins api list endpoints to use new member_role.members 2016-03-16 10:29:12 -04:00
Akita Noek
7ec3b3b8b5 Fixed up User.accessible_objects to return a User queryset
Was returnning a RolePermission qs, needed to be a User qs to match.
Also bolted on the role_permissions GenericRelation so we could just
reuse the ResourceMixin accessible_objects code
2016-03-16 10:26:53 -04:00
Wayne Witzel III
63d8efc268 Merge pull request #1256 from anoek/rbac
Misc RBAC fixes and enhancements
2016-03-16 10:18:13 -04:00
Alan Rominger
96517d2381 Merge pull request #1230 from AlanCoding/647_org_summary_numbers
Provide counts of organization resources in list view
2016-03-16 10:07:25 -04:00
Akita Noek
9909ea90c1 Fixed post delete behavior for roles, added test 2016-03-16 09:13:33 -04:00
Akita Noek
67b37e17cb flake8 fixes 2016-03-16 08:54:59 -04:00
kensible
57caec392c Merge pull request #1237 from kensible/1231-lookupModal-specs
1231 lookup modal specs
2016-03-16 08:36:51 -04:00
Akita Noek
8625edfec7 Merge branch 'rbac' of github.com:ansible/ansible-tower into rbac 2016-03-15 17:02:16 -04:00
Akita Noek
7e0d2e6729 more .users -> member_role.members 2016-03-15 17:00:20 -04:00
Akita Noek
defe4a4fd8 Made credentials accessible by system administrators and auditors 2016-03-15 16:51:44 -04:00
Akita Noek
ce669b03ad Switched to a nicer contextmanager implemenation for role hierarchy rebuild batching
#1206
2016-03-15 15:30:43 -04:00
AlanCoding
52cd4f5ef9 reduce test to only check project inventory connection 2016-03-15 15:06:00 -04:00
Wayne Witzel III
3197327b7f Merge pull request #1252 from wwitzel3/rbac
Fixing Inventory access
2016-03-15 14:56:58 -04:00
Wayne Witzel III
0e8b7ab4f4 Fixing Inventory access 2016-03-15 14:56:35 -04:00
Ken Hoes
85a9e14ced Split up and modularized organizations 2016-03-15 14:55:12 -04:00
Akita Noek
e45982b011 Signal bindings to add permissions from hosts to groups/inventory
We should probably move this into a more generic system.. but for the
time being this works, we can refactor later if we have a similar need
elsewhere.
2016-03-15 14:47:36 -04:00
AlanCoding
da39f1269a org counts code restructing to better prepare for RBAC merge 2016-03-15 14:36:56 -04:00
Akita Noek
b499555be4 Added auto_generated flag for RolePermissions 2016-03-15 13:36:28 -04:00
Akita Noek
ea9642f5df Fixed missing .distinct() necessary for '&' 2016-03-15 13:06:24 -04:00
Akita Noek
e0e3954a8a Fixed missing accessible_objects permission parameter 2016-03-15 13:05:58 -04:00
Akita Noek
f55d5d90f2 Merge branch 'rbac' of github.com:ansible/ansible-tower into rbac 2016-03-15 11:53:07 -04:00
Wayne Witzel III
dd647b2cad Merge pull request #1233 from anoek/active-flag-removal
Active flag removal
2016-03-15 11:52:23 -04:00
Akita Noek
cf56ada34d Merge pull request #1249 from wwitzel3/rbac
flake8 fixup
2016-03-15 11:48:34 -04:00
Akita Noek
b380641e0e Merge branch 'rbac' of github.com:ansible/ansible-tower into rbac 2016-03-15 11:46:27 -04:00
Akita Noek
721b95cf99 Dummy data generation script
Usage: ./manage.py generate_dummy_data --help
2016-03-15 11:45:56 -04:00
Leigh
dbee95ba8c Merge pull request #1246 from leigh-johnson/JobDetailService
Add JobDetailService, remove REST calls from JobDetail controller
2016-03-15 11:39:07 -04:00
Wayne Witzel III
3f29f1e3b5 flake8 fixup 2016-03-15 10:09:24 -04:00
Akita Noek
d805697093 Merge pull request #1247 from wwitzel3/rbac
RBAC Fixes
2016-03-15 09:56:46 -04:00
Akita Noek
d6429eb1e8 Active flag removal fix for .filter->all 2016-03-15 09:47:53 -04:00
Akita Noek
a845d5c0bb we removed our previous 0008 migration, so moving 0009 -> 0008 2016-03-15 09:34:50 -04:00
Akita Noek
6ea99583da Mass active flag code removal 2016-03-15 09:29:55 -04:00
Akita Noek
ba833d683e Active flag removal: switched from using mark_inactive to delete calls 2016-03-15 09:29:28 -04:00
Akita Noek
1e7c71edfb active flag removal in migration functions 2016-03-15 09:29:28 -04:00
Akita Noek
ddf3265bd2 Reordered system job template migration to happen after rbac migrations
The system job template migration creates SystemJobTemplate instances,
which necessarily depend on the RBAC modifications.
2016-03-15 09:27:06 -04:00
Akita Noek
26f73fa68e Remove active flag from ever getting created in the rbac models 2016-03-15 09:26:31 -04:00
Akita Noek
4825b2a6fc Do cleanup_deleted on migrate. Re-ordered active flag removal to be before system job template creation.
Also removed active flag deletes from remaining cleanup_deleted
management command as they will no longer be needed - but the
deletes of the authentication tokens as well as potentially disabled
users are still necessary, so the cleanup_deleted command will continue
to exist.

Reordering of the active flag removal to happen before the system job
template creation is necessary since the system job template creation
hits the license checker which at some point runs queries that depend on
the active flag, and with that code changing to not use the active flag,
we need to do the removal before we run this code.
2016-03-15 09:26:31 -04:00
Akita Noek
ec59330465 Active flag removed from Primordial Base Class 2016-03-15 09:26:31 -04:00
Wayne Witzel III
8003b45045 Merge branch 'rbac' of github.com:ansible/ansible-tower into rbac 2016-03-15 09:08:40 -04:00
Wayne Witzel III
076a91ea6d Test fixup and InventorySource fixup 2016-03-15 09:07:35 -04:00
Wayne Witzel III
86afc7b24d Merge pull request #1243 from anoek/rbac
Multi-org elimination for projects; Various test case cleanup for org users/admins removal
2016-03-15 09:05:10 -04:00
Leigh Johnson
af9882af97 Yoink REST calls from Job Details controller into modular service, resolves #1239 2016-03-14 21:16:44 -04:00
Akita Noek
ab23e983f8 More team/org users/admins -> member_role/admin_role updates 2016-03-14 17:00:59 -04:00
Akita Noek
c9b0625e39 More accessible_objects -> objects + filter 2016-03-14 16:50:52 -04:00
Akita Noek
05b98d4904 Removed accessible_objects filter from ActivityStream get_queryset 2016-03-14 16:32:59 -04:00
Akita Noek
495b5b9341 project test case fix, missing pytest marker 2016-03-14 16:28:57 -04:00