External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-09-16 17:00:12 -02:30
Code Issues Packages Projects Releases Wiki Activity
6,750 Commits 63 Branches 102 Tags
67f42eba8eba7234e0ad6aff71ae28b791252693
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Akita Noek 28acc9516d Hopefully fix ContentType problem hit during 2.4 -> 3.0 upgrade migration 
#1380
 2016-04-01 15:20:18 -04:00
Akita Noek b9a6f00da2 Reverted attempted fix of ActivityStreamAccess 
Related to #1364
 2016-03-31 14:28:19 -04:00
Akita Noek 219c09728d Merge branch 'devel' of github.com:ansible/ansible-tower into rbac 2016-03-31 11:32:02 -04:00
Akita Noek 2de83e63c3 Fixed up unified jobs/job templates api endpoints 2016-03-31 11:24:37 -04:00
Akita Noek 0101d53876 super(type(obj),self) -> super(Class, self) fixes 2016-03-31 10:54:01 -04:00
Akita Noek ab03441133 Let exceptions better bubble up through reverse_gfk 2016-03-31 10:54:01 -04:00
Akita Noek 0479c17256 Made reverse_gfk implementation suck a whole lot less 
#1342
 2016-03-31 10:54:01 -04:00
Akita Noek c61c8b2b45 Revert accidental active_flag removal changes in south_migrations 
Fixes #1349
 2016-03-31 09:48:14 -04:00
Akita Noek 728c41f03a Split active flag removal migration into two migrations 
Re #1344

https://docs.djangoproject.com/en/1.8/ref/migration-operations/#runpython
 2016-03-31 09:39:50 -04:00
Akita Noek 534faf011c count->exists 2016-03-31 09:39:50 -04:00
Akita Noek 156aeb931f count -> exists 2016-03-31 09:39:50 -04:00
Akita Noek 6b5c4338cc Removed superfluous method definition 2016-03-31 09:39:50 -04:00
Akita Noek af0b5b42c0 Merged label migrations; Active flag removal on new label system 2016-03-28 10:37:06 -04:00
Akita Noek 3b233f828e Merge branch 'devel' of github.com:ansible/ansible-tower into rbac 2016-03-28 09:23:53 -04:00
Akita Noek 97f16c7779 Added some select_related fields to a few endpoints so performance sucks less 2016-03-26 10:10:52 -04:00
Akita Noek 7310f9aa44 Be lazier with original parent role computations to avoid unnecessary queries 2016-03-26 09:56:57 -04:00
Akita Noek 712ec98f54 Fixed Credential creation in generate_dummy_data command 2016-03-26 09:08:17 -04:00
Akita Noek 453772f62c Fixed up credential viewability expectations in jobs_monlithic tests 
Super users can now see all credentials always.. Adjusted test to test
for this, as well as original test intent which was to test to ensure
after removing a team which has access to a credential, members of that
team no longer have access to the credential.
 2016-03-24 21:16:15 -04:00
Akita Noek c89a549cbd Removed deprecated user/team from select_related CredentialAccess queryset 2016-03-24 20:31:01 -04:00
Akita Noek c900c9126c missing .add 2016-03-24 18:34:24 -04:00
Akita Noek c60dd9207b Merge branch 'devel' of github.com:ansible/ansible-tower into rbac 2016-03-24 16:12:02 -04:00
Akita Noek 66dc4938a6 Merge branch 'rbac' of github.com:ansible/ansible-tower into rbac 2016-03-24 16:08:32 -04:00
Akita Noek b78221a306 Merge branch 'rbac' of github.com:ansible/ansible-tower into rbac 2016-03-24 16:07:55 -04:00
Akita Noek f9a1e37371 projects.py test fixes 2016-03-24 16:04:22 -04:00
Akita Noek 1dea6610a7 Fixed up tasks.py for credential changes 2016-03-24 15:35:37 -04:00
Akita Noek 434320f5a2 Credential user fix for schedules.py 2016-03-24 15:26:14 -04:00
Akita Noek e323f5a48b Merge branch 'merge-devel' into rbac 2016-03-24 15:23:23 -04:00
Akita Noek 625d94c81f typo 2016-03-24 15:23:10 -04:00
Akita Noek b932174ee2 Fixed up migrations after merge 2016-03-24 13:58:05 -04:00
Akita Noek d07da55eac fix merge fail 2016-03-24 13:54:03 -04:00
Akita Noek 5baa784ce2 Merge branch 'devel' of github.com:ansible/ansible-tower into merge-devel 2016-03-24 13:51:00 -04:00
Akita Noek 683f9cacbb Merge branch 'rbac' of github.com:ansible/ansible-tower into rbac 2016-03-24 13:34:31 -04:00
Akita Noek 9baaa83302 Add explicit transaction=True to some tests for jenkins test environment 2016-03-24 13:33:51 -04:00
Akita Noek f0740794c5 Better implementation of RoleUsersList queryset 2016-03-24 13:30:47 -04:00
Akita Noek bbef9b896f Removed RoleAccess queryset capabilities; add explicit can_read implemenation 
We can probably make this into a query set if we're ever interested, but
so far we just use can_read so better to have an explicit implemenation
 2016-03-24 13:27:57 -04:00
Akita Noek 2a446d206e Fix for RoleAccess queryset 2016-03-24 13:05:16 -04:00
Akita Noek 922da6ed7a whitespace 2016-03-24 11:06:03 -04:00
Akita Noek 6653a1e747 Validate that user provides a valid organization when posting a project 2016-03-24 11:03:42 -04:00
Akita Noek eccb50a253 Fixed projects creation api endpoints to take organization 2016-03-24 10:22:25 -04:00
Akita Noek 342747866e flake8 2016-03-24 08:59:12 -04:00
Akita Noek 50a2fac465 Fixed some deprecated Team.projects fallout 2016-03-23 22:53:53 -04:00
Akita Noek d838753e60 Fixed up tests from deprecation of Team.projects 2016-03-23 16:25:23 -04:00
Akita Noek 90424eb4b0 Removed pirate debugging statement 2016-03-23 16:24:50 -04:00
Akita Noek 201e4a9ca3 Mark some currently non-functional tests as skipped until they're implemented 
re #1254
 2016-03-23 15:34:20 -04:00
Akita Noek b263f25911 Merge branch 'rbac' of github.com:ansible/ansible-tower into rbac 2016-03-23 15:30:37 -04:00
Akita Noek de114336ef Merge branch 'rbac' of github.com:anoek/ansible-tower into rbac 2016-03-23 15:30:33 -04:00
Akita Noek 4aa1602255 Deprecated Team.projects and Project.teams relations, switching to using RBAC 2016-03-23 15:30:03 -04:00
Akita Noek 9dbe9fb7ad Moved a couple of test cases from old/projects.py tests to new test_projects.py tests 2016-03-23 14:47:01 -04:00
Akita Noek 9574c3b506 whitespace 2016-03-23 13:36:28 -04:00
Akita Noek 8afa10466f Fix ad_hoc.py tests again 
Credential fix
 2016-03-23 12:09:04 -04:00
Akita Noek 7fa47c1b38 Merge branch 'rbac' of github.com:anoek/ansible-tower into rbac 2016-03-23 11:34:09 -04:00
Akita Noek 573e8e1151 Marking some job_monolithic tests to skip until we want to fully port them 
Tracking the port in #1296
 2016-03-23 11:30:33 -04:00
Akita Noek 7eac303ec7 Merge branch 'rbac' of github.com:ansible/ansible-tower into rbac 2016-03-23 09:32:31 -04:00
Akita Noek 68bb342fe9 flake8 2016-03-22 22:25:50 -04:00
Akita Noek fc25cb7e95 More .all() fixes re active flag removal 2016-03-22 22:23:32 -04:00
Akita Noek 6323e023dc .all() fixes re active flag removal 2016-03-22 17:35:36 -04:00
Akita Noek b9924613fa Timing adjustment to let our large data test pass for now 
This hack is to avoid having failure noise as we're working through
preparing to merge into devel.

There is an issue #992 to track and fix this specific problem properly,
so this change is just to squelch the test for now.
 2016-03-22 15:57:51 -04:00
Akita Noek dde2e66a2f Fix missing .all() from active flag filter nuke 2016-03-22 15:36:07 -04:00
Akita Noek 16475dd973 Updated old/users.py tests to reflect new test expecations 2016-03-22 14:08:13 -04:00
Akita Noek aa44ac316d Add support for ORG_ADMINS_CAN_SEE_ALL_USERS flag 
Completes #1293
 2016-03-22 14:06:32 -04:00
Akita Noek c42f8f98a4 Fixed user/:id/teams access control 2016-03-22 14:05:53 -04:00
Akita Noek 5db7383a38 Bolt on organizations and admin_of_organizations properties to User model; fix related API endpoints 
This partially mimics the old api feel, though doesn't enable searching
through these fields via ORM queries of course.
 2016-03-22 13:13:41 -04:00
Akita Noek cb83ee3ec6 Tightened user can_admin access so only sys admins and org admins can admin users 2016-03-22 11:40:06 -04:00
Akita Noek 4dcf51e791 Merge branch 'rbac' of github.com:ansible/ansible-tower into rbac 2016-03-22 11:10:48 -04:00
Akita Noek f8415d06c8 Fixed scripts.py tests 2016-03-22 11:09:54 -04:00
Akita Noek 3bcabec2a3 Print garbage cleanup 2016-03-22 08:55:18 -04:00
Akita Noek d8f527429c flake8 fixes 2016-03-22 08:05:04 -04:00
Akita Noek 7d932b6633 Add missing .all() from filter removal 2016-03-21 22:29:16 -04:00
Akita Noek c7234f42c7 Give SU's access to all projects to protect against unreachable orphans 2016-03-21 22:28:05 -04:00
Akita Noek 7ca516da0b Misc fixes for old projects tests 2016-03-21 22:17:16 -04:00
Akita Noek b111484b89 old users tests: deprecated_userse -> member_role.members changes 2016-03-21 22:16:54 -04:00
Akita Noek 8c403cf77f Fixed SU project access 2016-03-21 22:15:08 -04:00
Akita Noek 173ae3b2db Fixed deprecated_teams relation, and typos 2016-03-21 22:14:39 -04:00
Akita Noek 54cf4b6e02 Grant project access to teams through role parenting 2016-03-21 22:13:12 -04:00
Akita Noek e4a1a9c3bf Fixed user/:id/projects after ripping out Team.users 2016-03-21 22:09:55 -04:00
Akita Noek 01e16f6722 Fixed user/:id/teams endpoint after ripping out Team.users 2016-03-21 22:09:18 -04:00
Akita Noek 6d62fbc541 Add test for most recent rbac m2m binding fail 2016-03-21 21:09:58 -04:00
Akita Noek ec851492d6 Fixed Role m2m binding so it even works all the time 2016-03-21 21:09:22 -04:00
Akita Noek 4bb2f27fe5 Prefixed User.organizations and User.admin_of_organizations with deprecated_ 2016-03-21 15:43:58 -04:00
Akita Noek 91690a0eb7 Removed deprecated use of admin_of_organizations 2016-03-21 15:43:21 -04:00
Akita Noek b46bdef732 Ported old/organizations.py tests to new rbac system 2016-03-21 15:35:08 -04:00
Akita Noek a5c355d753 Updated UserAccess to reflect new visibility requirements (and work) 2016-03-21 15:08:10 -04:00
Akita Noek e4948f210f Fixed up migrations 2016-03-18 16:31:53 -04:00
Akita Noek 92df6b0fb2 Merge branch 'devel' into rbac 2016-03-18 16:26:45 -04:00
Akita Noek 8addccd434 Renamed migrations to be a little more descriptive 
Mainly for sanity when merging migrations into long running branches..
but nice anyways I think
 2016-03-18 16:17:58 -04:00
Akita Noek 54aa465448 Merge remote-tracking branch 'ansible/rbac' into rbac 2016-03-18 15:42:58 -04:00
Akita Noek beb4f95fa6 Merge remote-tracking branch 'ansible/rbac' into rbac 2016-03-18 15:42:06 -04:00
Akita Noek 5741b47c54 Merge remote-tracking branch 'ansible/devel' into merge-devel 2016-03-18 15:40:13 -04:00
Akita Noek 4fac1e96f4 Test that helps test the implemenation of role auto-reparenting 2016-03-18 15:11:13 -04:00
Akita Noek 23f0286669 Refactored ImplicitRoleField to be faster and avoid some bad looping cases 
The role creation logic was a bit too lazy and caused some looping when
using other roles as parent roles. This refactor does all role
creation for a single model instance up front together, which helps
avoid these situations as well as eliminates some extra db updates and
inserts that would happen the old way.
 2016-03-18 15:10:08 -04:00
Akita Noek 13dd27ac52 Merge branch 'rbac' of github.com:ansible/ansible-tower into rbac 2016-03-18 11:17:04 -04:00
Akita Noek ccfb73766c Code de-dup 2016-03-17 13:25:04 -04:00
Akita Noek d997e93aa1 Removed attach/detach capabilities from organizations/:id/projects endpoint as it's no longer applicable 2016-03-17 10:07:57 -04:00
Akita Noek 1827de48af more deprecated_users -> member_role.members fixes in tests 2016-03-17 08:56:02 -04:00
Akita Noek ecf4d2872a Fixes for schedule tests 2016-03-17 08:55:32 -04:00
Akita Noek 3ca016faaf Revert ScheduleAccess can_* methods to route through other *Access classes 
This takes care of all the polymorphic cases, which we'd have to
otherwise handle
 2016-03-17 08:53:40 -04:00
Akita Noek c0245317b3 flake8 2016-03-16 16:48:07 -04:00
Akita Noek a1202a20ab Added .all()'s needed after active flag filter removal 2016-03-16 16:47:35 -04:00
Akita Noek 8fb9ef37c2 Permission -> RBAC fixes in our inventory tests 2016-03-16 16:43:54 -04:00
Akita Noek 293fd73fe6 Missing .distinct() 2016-03-16 16:43:31 -04:00