6668 Commits

Author SHA1 Message Date
Akita Noek
0ca3c62273 Merge pull request #1360 from anoek/rbac
Fixed up unified jobs/job templates api endpoints
2016-03-31 11:32:17 -04:00
Akita Noek
2de83e63c3 Fixed up unified jobs/job templates api endpoints 2016-03-31 11:24:37 -04:00
Wayne Witzel III
344588b102 Merge pull request #1353 from anoek/rbac
Made reverse_gfk implementation suck a whole lot less
2016-03-31 11:22:44 -04:00
Wayne Witzel III
55b06e4d8b Merge pull request #1358 from wwitzel3/rbac
RBAC PR Fixes
2016-03-31 11:21:04 -04:00
Wayne Witzel III
24e20abb1b more unicode safety 2016-03-31 11:20:19 -04:00
Wayne Witzel III
5de3d57980 return actual QuerySet objects 2016-03-31 11:14:08 -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
0360093622 Merge pull request #1356 from jlmitch5/rbac_perm_ui
Rbac perm ui
2016-03-31 10:51:14 -04:00
Akita Noek
f9cc986d85 Merge pull request #1355 from wwitzel3/rbac
RBAC PR Fixes
2016-03-31 10:46:47 -04:00
John Mitchell
064a04cf16 update to perm ui for rbac branch 2016-03-31 10:44:41 -04:00
John Mitchell
70c7c0242b comment out ansible help service 2016-03-31 10:44:41 -04:00
Wayne Witzel III
ad2c2af22e fixed get_queryset methods in access 2016-03-31 10:42:43 -04:00
Wayne Witzel III
fa67bd3f0e unicode safety 2016-03-31 10:24:09 -04:00
Wayne Witzel III
2ae47a6bab do not use _in for single item 2016-03-31 10:23:42 -04:00
Wayne Witzel III
634f7be692 use explicit class in super to keep the view inheritable 2016-03-31 10:23:25 -04:00
Wayne Witzel III
3d05493c54 use exists instead of count 2016-03-31 10:22:10 -04:00
Akita Noek
2bb9b8a6fe Merge pull request #1352 from wwitzel3/rbac
RBAC PR Fixes
2016-03-31 10:06:20 -04:00
Wayne Witzel III
d20d67d5f3 Merge pull request #1350 from anoek/rbac
Split active flag removal migration
2016-03-31 10:05:59 -04:00
Wayne Witzel III
a1d1ddee2b cleaner get/create impl 2016-03-31 09:58:23 -04:00
Wayne Witzel III
e84008fe51 use len instead of count to take advantage of cache 2016-03-31 09:58:05 -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
330acc85ae Merge pull request #1346 from wwitzel3/rbac
make migrations unicode safe, fixes #1345
2016-03-31 09:08:41 -04:00
Wayne Witzel III
097bd805fa make migrations unicode safe, fixes #1345 2016-03-30 16:40:43 -04:00
Akita Noek
33a31a1da7 Merge pull request #1336 from wwitzel3/rbac
add rbac migration logging and reduce memory consumption
2016-03-29 20:45:40 -04:00
Wayne Witzel III
82b72f99ca add rbac migration logging and reduce memory consumption 2016-03-29 17:16:26 -04:00
Akita Noek
1c5ea258ed Merge pull request #1316 from anoek/rbac
Merge in new label code from devel
2016-03-28 10:47:45 -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
Chris Meyers
4ff73b2630 Merge pull request #1305 from chrismeyersfsu/feature-labels
job template labels init implementation
2016-03-28 09:01:12 -04:00
Akita Noek
051ef4220e Merge pull request #1310 from anoek/rbac
Fixed up some missing select_related cases on RBAC
2016-03-26 11:41:39 -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
036044038f Merge pull request #1306 from anoek/rbac
More test fixes on rbac branch
2016-03-24 22:47:54 -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
c9ab92bd84 Merge pull request #1 from AlanCoding/org_detail_rbac_update
Update organization detail view counts for RBAC
2016-03-24 16:43:14 -04:00
AlanCoding
f8656b38e7 implemented RBAC version of org detail counts, test passes 2016-03-24 16:38:45 -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
Wayne Witzel III
8780e0d656 Merge pull request #1307 from wwitzel3/rbac
Fix old/inventory tests for Credential
2016-03-24 16:08:08 -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
64e080ba53 Merge pull request #1301 from AlanCoding/647_org_detail_counts
Add organization counts in detail view
2016-03-24 16:07:04 -04:00