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

6401 Commits

Author SHA1 Message Date
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
Akita Noek
d805697093 Merge pull request #1247 from wwitzel3/rbac
RBAC Fixes
2016-03-15 09:56:46 -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
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
Akita Noek
6549a0225b Various org.admins -> org.admin_role.members transformations 2016-03-14 16:28:24 -04:00
Akita Noek
0c0ed45b44 Removed api/v1/projects/N/organizations as it is no longer relevant
Also added 'organization' related field to the project
2016-03-14 16:26:15 -04:00
Akita Noek
7cf28e2f03 More project migration fixes 2016-03-14 16:01:12 -04:00
Akita Noek
9146b29770 Fix up some project multi-org -> single-org fallout 2016-03-14 15:31:05 -04:00
Akita Noek
820ed0b747 Merge branch 'rbac' of github.com:ansible/ansible-tower into rbac 2016-03-14 15:05:01 -04:00
Akita Noek
ba6752fb23 Eliminate multiple-organization projects
Projects are duplicated with this migration to provide a nearly
equivalent functionality.

Satisifies #1164
2016-03-14 14:57:24 -04:00
Akita Noek
44bfc44555 Merge pull request #1238 from wwitzel3/rbac
RBAC Updates
2016-03-14 14:43:28 -04:00
Wayne Witzel III
2e6e7ff9c8 Updating migration path for RBAC 2016-03-14 14:42:09 -04:00
Wayne Witzel III
57530602f6 Fixing old tests to use deprecated_users/deprecated_admins 2016-03-14 13:57:41 -04:00
Wayne Witzel III
1f383f9873 Added back RBAC project migration tests 2016-03-14 13:14:57 -04:00
Wayne Witzel III
5b70f29a39 Fix migration tests to use new deprecated fields 2016-03-14 11:57:05 -04:00
Wayne Witzel III
49165c4fcd Rename users/admins deprecated_users/deprecated_admins 2016-03-14 11:56:42 -04:00
jlmitch5
10646a448a remove reference to about ansible service 2016-03-14 10:14:52 -04:00
Akita Noek
34fd07de7a Merge pull request #1225 from wwitzel3/rbac
Fixed up m2m_changed for rbac, added User.admin_role
2016-03-11 16:04:40 -05:00
Wayne Witzel III
16673b1468 Fix the m2m_changed when accessed reversed 2016-03-11 15:59:01 -05:00
Wayne Witzel III
45483fb057 Refactor m2m_changed so reverse works 2016-03-11 15:18:24 -05:00
Wayne Witzel III
31a461956a Fixed up m2m_changed for rbac, added User.admin_role 2016-03-11 14:59:47 -05:00
Akita Noek
4024bbfe2b Merge pull request #1222 from wwitzel3/rbac
Remove UserResource and ensure RolePermission during migration
2016-03-11 11:00:29 -05:00
Wayne Witzel III
80013e67bc Remove UserResource and ensure RolePermission during migration 2016-03-11 10:58:24 -05:00
Akita Noek
55dc21e97d Merge pull request #1219 from wwitzel3/rbac
Allow org.admin_role.members to administer org.member_role.members
2016-03-11 10:53:02 -05:00
Wayne Witzel III
94e8058127 Allow org.admin_role.members to administer org.member_role.members 2016-03-11 10:41:42 -05:00
Akita Noek
a45e5b9eab Merge pull request #1217 from wwitzel3/rbac
Added user role creation, accessible methods, and fixed up m2m_update
2016-03-11 09:40:31 -05:00
Wayne Witzel III
55e071535b Added user role creation, accessible methods, and fixed up m2m_update 2016-03-11 07:07:17 -05:00
jlmitch5
2e232159e0 Merge pull request #1116 from jlmitch5/rbac_add_perms
Rbac UI: add permissions modal
2016-03-10 15:39:03 -05:00
John Mitchell
8f1cdbdbf9 fixed modal being open on route change and modal scrolling 2016-03-10 14:50:42 -05:00
John Mitchell
63d91268ea add no description provided in case one is not for a role in the key 2016-03-09 16:52:06 -05:00
John Mitchell
6097406e36 add key pane 2016-03-09 16:51:02 -05:00
John Mitchell
87c9798c09 added process errors and fixed css bug on add perm modal 2016-03-09 15:40:41 -05:00
John Mitchell
3829f276e7 remove debug from add perm partial 2016-03-09 15:40:40 -05:00
John Mitchell
09c54b1e88 better formed css for add permissions 2016-03-09 15:40:40 -05:00
John Mitchell
0026ed88eb fixed table header radius at end of list row 2016-03-09 15:40:40 -05:00
John Mitchell
56364617fd clean up of ui rbac code 2016-03-09 15:40:40 -05:00
John Mitchell
433ba95add working commit of rbac add permissions flow 2016-03-09 15:40:40 -05:00
John Mitchell
6b37054621 working commit rbac add permissions 2016-03-09 15:40:40 -05:00
John Mitchell
2f1ee901e4 fixes to pr 2016-03-09 15:40:40 -05:00
John Mitchell
9ea0803b45 added role list and deletion to projects object 2016-03-09 15:40:40 -05:00
Akita Noek
8ff766f5df Merge pull request #1203 from wwitzel3/rbac
test fixups and re-add can_access
2016-03-09 15:35:26 -05:00
Wayne Witzel III
09d46f9336 test fixups and re-add can_access 2016-03-09 15:33:12 -05:00
Akita Noek
0d0d87073e Merge pull request #1197 from anoek/rbac
Fixed up migrations after last merge
2016-03-09 13:11:10 -05:00
Akita Noek
97a6f23380 Fixed up migrations after last merge 2016-03-09 13:08:02 -05:00