6358 Commits

Author SHA1 Message Date
Wayne Witzel III
31a461956a Fixed up m2m_changed for rbac, added User.admin_role 2016-03-11 14:59:47 -05:00
Wayne Witzel III
80013e67bc Remove UserResource and ensure RolePermission during migration 2016-03-11 10:58:24 -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
Wayne Witzel III
55e071535b Added user role creation, accessible methods, and fixed up m2m_update 2016-03-11 07:07:17 -05:00
Wayne Witzel III
09d46f9336 test fixups and re-add can_access 2016-03-09 15:33:12 -05:00
Akita Noek
0d0d87073e Merge pull request #1197 from anoek/rbac
Fixed up migrations after last merge
2016-03-09 13:11:10 -05:00
Akita Noek
97a6f23380 Fixed up migrations after last merge 2016-03-09 13:08:02 -05:00
Akita Noek
f59e603c18 Merge pull request #1195 from anoek/rbac
Merging in devel
2016-03-09 12:05:06 -05:00
Akita Noek
9d4e6dfc16 Merge branch 'devel' of github.com:ansible/ansible-tower into rbac 2016-03-09 12:04:05 -05:00
Akita Noek
9c78a85a70 Removed old test assertion 2016-03-09 12:03:20 -05:00
Akita Noek
5c8c6fe491 Merge pull request #1187 from anoek/rbac
Replaced Resource table with a GenericForeignKey  on RolePermission
2016-03-09 12:02:46 -05:00
Akita Noek
1989012fd5 Moved access_list url to <whatever>/id/access_list
Eg: organizations/1/access_list will now return a list of all users who
have access to that organization.

This replaces our initial implementation which was resources/id/access_list
2016-03-09 11:41:42 -05:00
Akita Noek
efcd4efda2 Moved the rbac field removal migration to happen after the migrate script part of the rbac migration 2016-03-09 11:31:00 -05:00
Akita Noek
87219135af Removed unneeded import 2016-03-09 10:39:31 -05:00
Akita Noek
b486c8d658 Merge branch 'rbac-resource-gfk' into rbac 2016-03-09 10:17:58 -05:00
Akita Noek
9aae2979d9 Replaced our 'Resource' table with a GenericForeignKey in RolePermission 2016-03-09 10:12:05 -05:00
Bill Nottingham
943dda231d Merge pull request #1118 from wenottingham/copyright-fix
Welcome to 2016!
2016-03-08 16:36:11 -05:00
Bill Nottingham
3c0254a941 Welcome to 2016! 2016-03-08 16:35:18 -05:00
Matthew Jones
823e54a0b9 Fix an error sending success notifications 2016-03-08 14:14:57 -05:00
Wayne Witzel III
0e641e0ace Merge pull request #1173 from wwitzel3/rbac
RBAC Access Updates
2016-03-08 14:10:27 -05:00
Wayne Witzel III
3df4c4ec93 fixing tests and migration issues 2016-03-08 14:09:16 -05:00
Wayne Witzel III
fd2212dd33 More updates to access, use RBAC for permission checks 2016-03-08 13:47:11 -05:00
Michael Abashian
0a4570ae0a Merge branch 'extra-vars' into devel 2016-03-08 11:03:10 -05:00
Michael Abashian
f2667598f0 Merge pull request #1129 from jaredevantabor/notifications
Adding initial notifications files
2016-03-08 10:52:22 -05:00
Leigh Johnson
8712666143 fix merge conflicts between 170a033 and leigh-johnson/Sprint3DemoFeedback 2016-03-08 10:06:00 -05:00
Michael Abashian
6cba39733b Merge pull request #1123 from mabashian/stdout-responsive
Styling tweaks to standard out and license views/dynamic details reload
2016-03-07 14:58:40 -05:00
Michael Abashian
ccaae088d6 Updated comments to reflect actual factory locations 2016-03-07 13:06:25 -05:00
Leigh Johnson
e5b50f182e remove ref to removed function #1112 2016-03-07 11:36:28 -05:00
Michael Abashian
976d242075 Reduced the space between the extra vars label and the code mirror instance down to 10px. 2016-03-07 11:00:07 -05:00
Leigh Johnson
d74e475332 comment out ngAnimate dependency #1112 2016-03-07 10:55:05 -05:00
Leigh Johnson
1bc3657fe7 fixes demo feedback bugs in #1112 2016-03-07 10:46:11 -05:00
Michael Abashian
73d80f7179 Leveraging CodeMirror to display extra variables for management jobs 2016-03-07 10:32:30 -05:00
Wayne Witzel III
39a1e893fb Merge branch 'rbac' of github.com:ansible/ansible-tower into rbac 2016-03-07 08:49:48 -05:00
Chris Church
51cb262a84 Merge pull request #1125 from cchurch/job-template-callback-parser-fix
Fix job template callback view to accept URL-encoded form data.
2016-03-05 12:22:15 -05:00
Chris Church
8ae639d165 Merge pull request #1124 from cchurch/system-jobs-migration
Add migration to create system job templates for a new database.
2016-03-05 11:23:45 -05:00
Jared Tabor
a35368f558 Adding initial notifications files 2016-03-04 15:39:23 -08:00
Chris Church
60b6b6bfea Fix job template callback view to accept URL-encoded form data. 2016-03-04 16:36:02 -05:00
James Laska
ee5694b175 Add ISSUE_TEMPLATE.md
fixes #1106
2016-03-04 16:19:00 -05:00
Chris Church
f1c13e0837 Add migration to create system job templates for a new database. 2016-03-04 15:41:40 -05:00
Michael Abashian
08c33a8c6b Refresh the job details when the job finishes running. This pulls in details not available at the beginning of a job. One plus two styling tweaks 2016-03-04 14:29:15 -05:00
Chris Meyers
5759db1229 flake8 fix 2016-03-04 14:14:10 -05:00
Akita Noek
38f22cc839 Merge pull request #1121 from anoek/rbac
Merging devel
2016-03-04 14:03:43 -05:00
Akita Noek
e9c3d98a44 Merge branch 'devel' of github.com:ansible/ansible-tower into rbac 2016-03-04 14:02:01 -05:00
Akita Noek
e5b0e2aeb3 Merge pull request #1064 from anoek/devel
Fixed pagination nav issue
2016-03-04 14:00:24 -05:00
Akita Noek
5a31804330 Just use num_pages when we're at the end of a nav list 2016-03-04 13:37:07 -05:00
Chris Meyers
29e0652bfc Merge pull request #1117 from chrismeyersfsu/fix-fact_cache_receiver
find correct fact to update
2016-03-04 11:51:40 -05:00
Chris Meyers
451a633b3f Merge pull request #1115 from chrismeyersfsu/fix-mongo_off
do not require mongo to be on
2016-03-04 11:44:37 -05:00
Chris Meyers
7494b13704 find correct fact to update
* The fact cache receiver needs to look for an exact match, rather than
* a relative, most recent fact.
2016-03-04 11:41:08 -05:00
Akita Noek
e28eec4a56 Fix missing semicolons 2016-03-04 11:37:47 -05:00
Akita Noek
cf5d718fa8 Fixed pagination nav issue
Fixes #1021
2016-03-04 11:36:57 -05:00