Chris Meyers
cdcf81cffa
rbac active removal test cases fixes
2016-04-04 09:56:36 -04:00
Akita Noek
28acc9516d
Hopefully fix ContentType problem hit during 2.4 -> 3.0 upgrade migration
...
#1380
2016-04-01 15:20:18 -04:00
Chris Meyers
ff5935ccfd
Merge branch 'test-labels' into devel
2016-04-01 13:36:41 -04:00
Chris Meyers
a01b2913bb
mockity mock mock
2016-04-01 13:34:06 -04:00
Akita Noek
a4ee862b6a
Merge pull request #1372 from wwitzel3/rbac
...
RBAC migration fixes
2016-04-01 09:25:39 -04:00
Wayne Witzel III
d7a81c62d3
fixup inventory migration from PR feedback
2016-04-01 09:21:45 -04:00
Wayne Witzel III
1d2d043c29
fixes:#1371 - migration log write permissions
2016-04-01 09:06:40 -04:00
Akita Noek
b9a6f00da2
Reverted attempted fix of ActivityStreamAccess
...
Related to #1364
2016-03-31 14:28:19 -04:00
Wayne Witzel III
ed17be242d
more unicode fixes
2016-03-31 14:20:16 -04:00
Wayne Witzel III
d7a4e0ca99
Merge branch 'rbac' of github.com:ansible/ansible-tower into rbac
2016-03-31 12:41:47 -04:00
Wayne Witzel III
d68fc7a185
create actual QuerySets
2016-03-31 12:41:34 -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
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
f9cc986d85
Merge pull request #1355 from wwitzel3/rbac
...
RBAC PR Fixes
2016-03-31 10:46:47 -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
Akita Noek
2bb9b8a6fe
Merge pull request #1352 from wwitzel3/rbac
...
RBAC PR Fixes
2016-03-31 10:06:20 -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
156aeb931f
count -> exists
2016-03-31 09:39:50 -04:00
Wayne Witzel III
097bd805fa
make migrations unicode safe, fixes #1345
2016-03-30 16:40:43 -04:00
AlanCoding
fa92b2e851
back out openstack_v3 options but retain v3 functionality
2016-03-30 16:20:20 -04:00
Wayne Witzel III
82b72f99ca
add rbac migration logging and reduce memory consumption
2016-03-29 17:16:26 -04:00
Chris Church
3660b04d62
Add trailing newline to key data for OpenSSH formatted keys.
2016-03-29 11:03:56 -04:00
Chris Church
e248937595
Remove scan as an option for job type on ad hoc commands.
2016-03-28 18:42:03 -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
AlanCoding
18d2a30ff4
skip test for current devel branch, planned for RBAC
2016-03-28 09:23:33 -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
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
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
Wayne Witzel III
08e9c46c41
Fix old/inventory tests for Credential
2016-03-24 16:05:31 -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
Chris Meyers
d2de21ee50
job template labels init implementation
2016-03-24 15:26:14 -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
5baa784ce2
Merge branch 'devel' of github.com:ansible/ansible-tower into merge-devel
2016-03-24 13:51:00 -04:00
