5964 Commits

Author SHA1 Message Date
Akita Noek
4bc9ca2096 Merge pull request #905 from wwitzel3/rbac
RBAC tests and fixes
2016-02-10 15:22:11 -05:00
Wayne Witzel III
6877a7a566 added Group.parents rebuilding 2016-02-10 15:13:24 -05:00
Wayne Witzel III
020fda658a Merge branch 'rbac' of github.com:ansible/ansible-tower into rbac 2016-02-09 10:28:31 -05:00
Wayne Witzel III
9f0e4669df added TeamAccess tests 2016-02-09 10:28:15 -05:00
Wayne Witzel III
3ef9baaa8b added OrganizationAccess tests 2016-02-09 10:28:03 -05:00
Akita Noek
2de6bdd5c3 Merge pull request #886 from anoek/rbac-devel-integration
Pull in latest patches on devel
2016-02-09 09:51:14 -05:00
Akita Noek
29f8d6b778 Merge branch 'devel' of github.com:ansible/ansible-tower into rbac-devel-integration 2016-02-09 09:47:29 -05:00
Wayne Witzel III
ca67772d9f Merge pull request #884 from anoek/rbac
User and Project migration & testing
2016-02-09 09:17:47 -05:00
Akita Noek
a03d48eeb7 Add member_role to organizations 2016-02-08 22:54:19 -05:00
Akita Noek
a2b9777cc7 Add migrate_users and migrate_projects to our migration plan 2016-02-08 22:54:19 -05:00
Akita Noek
34067d9c0e Project migration and tests 2016-02-08 22:54:19 -05:00
Akita Noek
d51447e158 Migration and tests for super users 2016-02-08 22:54:19 -05:00
Akita Noek
5008e3faf5 Add parent System roles to organization roles 2016-02-08 22:54:19 -05:00
Akita Noek
f7dc3c0f0d Added an explicit member role, distinct from auditor role 2016-02-08 22:54:19 -05:00
Wayne Witzel III
916dfb62cc Merge pull request #881 from wwitzel3/rbac
flake8 fixup
2016-02-08 18:19:02 -05:00
Leigh Johnson
cd6f42ee68 fixes #875 - init bootstrap modals with backdrop: "static" option 2016-02-08 17:16:26 -05:00
Wayne Witzel III
0ba7992004 flake8 fixup 2016-02-08 16:37:05 -05:00
Akita Noek
6df8017cb1 Merge pull request #877 from wwitzel3/rbac-port-migrations
Convert migrate_to_rbac method to Migrations
2016-02-08 16:30:35 -05:00
Wayne Witzel III
e71de34cc1 convert Inventory to django migrations 2016-02-08 16:22:41 -05:00
Wayne Witzel III
f29fdf694f convert Team to django migrations 2016-02-08 16:06:12 -05:00
Wayne Witzel III
8cf0ba0da7 convert Credential to django migration 2016-02-08 15:54:11 -05:00
Wayne Witzel III
1ed18e4561 convert Organization to django migration 2016-02-08 15:53:48 -05:00
Wayne Witzel III
b8a7ad17ea Added initial rbac migrations 2016-02-08 15:33:59 -05:00
Wayne Witzel III
0d868b702e Merge pull request #817 from wwitzel3/rbac
flake8 fixups
2016-02-08 11:33:21 -05:00
Wayne Witzel III
9ddabeff83 flake8 fixups 2016-02-08 10:32:55 -05:00
Akita Noek
1418e95155 Merge pull request #813 from anoek/rbac 2016-02-05 17:05:30 -05:00
Akita Noek
70229076d2 Removed unnecessary ResourceHierarchy model 2016-02-05 17:03:59 -05:00
Akita Noek
fe29486d7b Removed unnecessary save() 2016-02-05 17:01:19 -05:00
Akita Noek
619e5797d4 RBAC inventory migration tests 2016-02-05 16:59:38 -05:00
Akita Noek
d5740408e9 Addd inventory fixture 2016-02-05 16:59:22 -05:00
Akita Noek
9f33835582 Added RBAC migration code 2016-02-05 16:58:41 -05:00
Akita Noek
332b8b3b49 Added Role.is_ancestor_of predicate 2016-02-05 16:58:16 -05:00
Akita Noek
4540eb0079 Updated role hierarchy cache rebuilder to handle adds to .children as well as .parents 2016-02-05 16:46:00 -05:00
Wayne Witzel III
737fad8c5a Merge pull request #805 from wwitzel3/rbac
Added Credential migration tests and extended organization tests.
2016-02-05 10:26:13 -05:00
Wayne Witzel III
5ed766ed35 Added Team.migrate_to_rbac and tests 2016-02-05 09:57:15 -05:00
Matthew Jones
a2cf365325 Merge pull request #804 from cchurch/allow-null-or-blank-for-project-booleans
Allow null/blank input for boolean fields on projects.
2016-02-05 09:55:15 -05:00
Matthew Jones
b8dfa3df16 Merge pull request #803 from cchurch/remove-fields-for-ad-hoc-commands
Remove unified_job_template and description fields for ad hoc commands
2016-02-05 09:55:06 -05:00
Matthew Jones
38b1d13edc Merge pull request #802 from cchurch/metadata-check-if-view-has-serializer
Check if view has a get_serializer method before trying to call it.
2016-02-05 09:54:59 -05:00
Matthew Jones
a20fa59b9c Merge pull request #801 from cchurch/include-api-css-js
Include api.css and api.js under awx/static/.
2016-02-05 09:54:48 -05:00
Matthew Jones
e890f23d00 Merge pull request #799 from cchurch/quick-fix-select-related
Quick fix for select related error with unified job templates and jobs
2016-02-05 09:54:37 -05:00
Matthew Jones
71cd77c3e0 Merge pull request #798 from cchurch/fix-792
Don't show playbooks under project detail.
2016-02-05 09:54:26 -05:00
Wayne Witzel III
7b3f3675f8 flake8 fixes 2016-02-05 09:18:52 -05:00
Wayne Witzel III
89236a1fe6 extended test_rbac_organization tests 2016-02-05 08:50:27 -05:00
Wayne Witzel III
58a603bac1 added Credential.migrate_to_rbac and tests 2016-02-05 08:47:15 -05:00
Chris Church
abc8da4531 Allow null/blank input for boolean fields on projects. Fixes #791. 2016-02-05 05:14:48 -05:00
Chris Church
da0f87c325 Remove unified_job_template and description fields for ad hoc commands. Fixes #789. 2016-02-05 04:55:40 -05:00
Chris Church
23feccdbf3 Check if view has a get_serializer method before trying to call it. Fixes OPTIONS issue in #788. 2016-02-05 04:45:14 -05:00
Chris Church
da7d4f4c67 Include api.css and api.js under awx/static/. Fixes #788. 2016-02-05 04:41:10 -05:00
Chris Church
7a0574e6f3 Quick fix for select related error with unified job templates and jobs. Fixes #793 and #795. 2016-02-05 04:30:08 -05:00
Chris Church
217fd383b3 Don't show playbooks under project detail. Fixes #792. 2016-02-05 04:09:17 -05:00