Chris Church
d51f56af9c
Merge pull request #1327 from cchurch/no-scan-for-you
...
Remove scan as an option for job type on ad hoc commands.
2016-03-29 11:01:54 -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
Leigh Johnson
d0f3248d79
quick change to copy template name building, misc #1131 work
2016-03-28 17:34:37 -04:00
Chris Meyers
141f5e807e
Merge pull request #1321 from chrismeyersfsu/feature-labels_summary
...
Feature labels summary
2016-03-28 14:39:50 -04:00
Chris Meyers
8866f2a738
adds labels to jt and j summary fields
2016-03-28 13:39:00 -04:00
Chris Meyers
323b13f18c
add labels to /api/v1/
2016-03-28 13:33:55 -04:00
Ken Hoes
66bab4fcf2
Visual updates. Added in Create Host title.
2016-03-28 11:04:01 -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
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
Leigh Johnson
488b333387
fix incorrect color var, yoink eventviewer.html #1131
2016-03-27 21:07:51 -04:00
Leigh Johnson
45ec13e5d5
yoink EventViewer dependency #1131
2016-03-27 20:35:15 -04:00
Leigh Johnson
05b8538fde
Job Detail - host event modal, refactor EventViewer into job-details/host-event/ module #1131
...
first predemo pass
2016-03-27 20:23:59 -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
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
Wayne Witzel III
ad9bfe9bda
Merge pull request #1304 from anoek/rbac
...
Next batch of minor fixes on RBAC
2016-03-24 15:32:09 -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
d07da55eac
fix merge fail
2016-03-24 13:54:03 -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
Akita Noek
683f9cacbb
Merge branch 'rbac' of github.com:ansible/ansible-tower into rbac
2016-03-24 13:34:31 -04:00
Akita Noek
9baaa83302
Add explicit transaction=True to some tests for jenkins test environment
2016-03-24 13:33:51 -04:00
Akita Noek
f0740794c5
Better implementation of RoleUsersList queryset
2016-03-24 13:30:47 -04:00
Wayne Witzel III
f9770e2398
Merge pull request #1299 from wwitzel3/rbac
...
deprecate Credential.team/user
2016-03-24 13:29:24 -04:00
Akita Noek
bbef9b896f
Removed RoleAccess queryset capabilities; add explicit can_read implemenation
...
We can probably make this into a query set if we're ever interested, but
so far we just use can_read so better to have an explicit implemenation
2016-03-24 13:27:57 -04:00
Akita Noek
2a446d206e
Fix for RoleAccess queryset
2016-03-24 13:05:16 -04:00
Wayne Witzel III
c4c2d08042
Fixup API and old tests for credential access
2016-03-24 11:50:27 -04:00
Akita Noek
1a96d9705f
Merge pull request #1294 from anoek/rbac
...
Various updates for tests on RBAC branch
2016-03-24 11:13:22 -04:00
Akita Noek
922da6ed7a
whitespace
2016-03-24 11:06:03 -04:00
