6668 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
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
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
Leigh Johnson	3ada60d7d4	Host Events - exclude changed events from ok filter #1132	2016-03-20 14:17:08 -04:00
Leigh Johnson	7c1efea037	add onExit & onEnter hooks to $stateExtender, raze HostEventViewer and replace with host-events module, resolves #1132	2016-03-19 19:36:15 -04:00
AlanCoding	fcc02f7678	rebase and rename migrations corresponding to devel change	2016-03-18 16:45:06 -04:00
AlanCoding	f4b1de766d	Adding OpenStack v3 cred type	2016-03-18 16:41:09 -04:00
AlanCoding	c807d5dcf3	Add keystone v3 support via new domain field on credential	2016-03-18 16:41:09 -04:00
Akita Noek	80560fffc9	Merge pull request #1283 from anoek/rbac ... Fixed up migrations	2016-03-18 16:33:24 -04:00
Akita Noek	edabf23c6a	Merge pull request #1282 from anoek/devel ... Renamed migrations to be a little more descriptive	2016-03-18 16:32:26 -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	5a444d4b2c	Merge pull request #1281 from anoek/rbac ... Merging devel into rbac	2016-03-18 15:43:48 -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	9dc4f3e07d	Merge pull request #1280 from anoek/rbac ... Refactored ImplicitRoleField	2016-03-18 15:41:54 -04:00
Akita Noek	5741b47c54	Merge remote-tracking branch 'ansible/devel' into merge-devel	2016-03-18 15:40:13 -04:00