External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-09-14 07:50:09 -02:30
Code Issues Packages Projects Releases Wiki Activity
8,549 Commits 64 Branches 102 Tags
5b76df4d7f615c59cd126d445e0185a0e5b31e27
Commit Graph
8549 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Akita Noek 7eac303ec7 Merge branch 'rbac' of github.com:ansible/ansible-tower into rbac 2016-03-23 09:32:31 -04:00
Leigh 817ea4861b Merge pull request #1284 from leigh-johnson/JobDetailModalRestyle 
Remove HostEventsViewer and refactor into job-details/host-events module
 2016-03-23 09:15:20 -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
Matthew Jones 7f8fae566e Further decouple survey spec from enablement 
We now show the survey summary field only if the contents of the survey
spec or valid (not the default {})
 2016-03-22 14:59:56 -04:00
Wayne Witzel III 2494cc56df Merge branch 'rbac' of github.com:ansible/ansible-tower into devel 2016-03-22 14:10:42 -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
Wayne Witzel III 17daade6e6 Merge pull request #1288 from anoek/rbac 
Misc RBAC patches
 2016-03-22 13:51:24 -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
Matthew Jones 0e2184902e Handle runner items from ansible v2 
Also denote whether the trailing runner_on_ was a loop event
 2016-03-22 12:31:05 -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
Leigh Johnson 3889e32fd9 Host Events - support no results found, better searching, style tweaks, #1132 #1284 2016-03-22 10:57:48 -04:00
Wayne Witzel III 1d980affb2 Merge pull request #1289 from wwitzel3/devel 
Fix test_coverage make target
 2016-03-22 10:28:33 -04:00
Wayne Witzel III 5ce4cb95fa Update test make target, no fact/tests 2016-03-22 10:28:05 -04:00
Wayne Witzel III c7cb9f3a2d Merge pull request #1276 from wwitzel3/rbac 
Implements issue #1061, allow org admins (or higher) job delete
 2016-03-22 09:47:36 -04:00
Wayne Witzel III 7354d1da2c Fix test_coverage make target 2016-03-22 09:46:46 -04:00
Wayne Witzel III 99ca2efc4f Update Makefile, no more fact/tests 2016-03-22 09:31:11 -04:00
Wayne Witzel III 5313d2fcb0 Merge branch 'rbac' of github.com:ansible/ansible-tower into rbac 2016-03-22 09:24:56 -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
Matthew Jones f286dc7486 Fix an issue with the email notifier 
Incorrect body format assumptions in the email notifier
 2016-03-21 15:40:41 -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
Graham Mainwaring f35655ed48 Merge branch 'python27_el6' of github.com:ghjm/ansible-tower into python27_el6 
Conflicts:
	tools/docker-compose/start_development.sh
 2016-03-21 12:18:34 -04:00
Graham Mainwaring 1e8e53e811 Merge branch 'devel' of github.com:ansible/ansible-tower into python27_el6 
Conflicts:
	packaging/rpm/ansible-tower.spec
	tools/docker-compose/start_development.sh
 2016-03-21 12:13:50 -04:00
Graham Mainwaring 1427fee442 Add script wrapper to establish Tower SCL and venv before running Python 2016-03-21 12:11:19 -04:00
Graham Mainwaring 9bd1520efb Builds an RPM for EL6 with SCL python27 and httpd24 2016-03-21 12:11:19 -04:00
Matthew Jones 46bbc83d0d Changes for Tower virtualenv support 
* Break requirements down into ansible and tower reqs
* Generate separate Ansible and Tower virtual environments
* Install appropriate requirements files into each one
* Modify development tools to use these venvs instead of our old
  site-packages
* Modify settings to indicate venv enablement and location of venvs
* Modify tasks to use the proper virtual environment for its purpose
 2016-03-21 12:11:19 -04:00
Graham Mainwaring f5308d114a Merge 2016-03-21 12:07:31 -04:00
Graham Mainwaring 54dee33cc7 Add script wrapper to establish Tower SCL and venv before running Python 2016-03-21 11:47:19 -04:00