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
Leigh Johnson
af9882af97
Yoink REST calls from Job Details controller into modular service, resolves #1239
2016-03-14 21:16:44 -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
Matthew Jones
7e818319b5
Pass, don't return pass when checking mongo connectivity
2016-03-14 13:53:34 -04:00
Wayne Witzel III
1f383f9873
Added back RBAC project migration tests
2016-03-14 13:14:57 -04:00
Matthew Jones
001eb1f69f
Handle a mongo OperationFailure
...
This seems to happenw hen the database is up, allows us to connect but
we don't have permission to access the objects (or they don't exist
yet).
2016-03-14 11:57:34 -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
Ken Hoes
b43f7e8c7f
Lookup modal not-resizable
2016-03-14 11:42:44 -04:00
Ken Hoes
5fdab74ae7
Increase specificity and keep y-scrollbar for long name edge cases.
2016-03-14 11:36:29 -04:00
kensible
f6f4238445
Merge pull request #1235 from ansible/revert-1234-1231-lookupModal-specs
...
Revert "Lookup modal feedback from demo prep"
2016-03-14 10:30:19 -04:00
kensible
36182109e2
Revert "Lookup modal feedback from demo prep"
2016-03-14 10:27:25 -04:00
jlmitch5
10646a448a
remove reference to about ansible service
2016-03-14 10:14:52 -04:00
kensible
275bd553d0
Merge pull request #1234 from kensible/1231-lookupModal-specs
...
Lookup modal feedback from demo prep
2016-03-14 10:10:19 -04:00
Ken Hoes
9387725442
Lookup modal feedback from demo prep
2016-03-14 09:26:43 -04:00
AlanCoding
6996ea22b0
style tweaks, add one more assertion
2016-03-13 22:39:52 -04:00
AlanCoding
39c9563352
test and fix for POST to empty list scenaro and JT count fix
2016-03-13 20:40:21 -04:00
AlanCoding
9f25a48936
fix for POST scenario
2016-03-13 11:45:08 -04:00
AlanCoding
765dcd3318
Added queries that calculate counts for organization resources
2016-03-12 22:02:03 -05:00
Leigh
a1c843e9f6
Merge pull request #1226 from leigh-johnson/CopyJobTemplate2
...
v2, Directly edit a copied Job Template, refactor delete-job-template-service-test
2016-03-11 18:51:52 -05: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
Leigh Johnson
ff1c41e8dc
revert unintended change to awx-munin.conf
2016-03-11 15:33:16 -05:00
Wayne Witzel III
45483fb057
Refactor m2m_changed so reverse works
2016-03-11 15:18:24 -05:00
Matthew Jones
eab223d229
Make sure we are covering system jobs and template on notifications
2016-03-11 15:11:08 -05:00
Wayne Witzel III
31a461956a
Fixed up m2m_changed for rbac, added User.admin_role
2016-03-11 14:59:47 -05:00
Leigh Johnson
e34aebcd93
refactor delete-job-template.service-test, integrate jobTemplate.copy, resolves #1105 & #1047 , tracking #1176
2016-03-11 14:41:05 -05:00
Matthew Jones
cdc342a6ee
Fix fact database migration
...
For new installs the database may not be online and thus the migration
can't happen. This will allow it to continue but we may want more
messaging to the user running potential upgrades
2016-03-11 12:59:21 -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
Matthew Jones
c2ea9c3c00
Make survey always visible if license enables
...
Previously this would only be visible if survey is enabled. It should
be possible to define and view a survey even if this is disabled. The
enablement flag controls whether the survey prompt is shown and required.
2016-03-10 16:09:34 -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
