Commit Graph

1803 Commits

Author SHA1 Message Date
Akita Noek
97a6f23380 Fixed up migrations after last merge 2016-03-09 13:08:02 -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
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
Matthew Jones
823e54a0b9 Fix an error sending success notifications 2016-03-08 14:14:57 -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
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
Chris Church
60b6b6bfea Fix job template callback view to accept URL-encoded form data. 2016-03-04 16:36:02 -05:00
Chris Church
f1c13e0837 Add migration to create system job templates for a new database. 2016-03-04 15:41:40 -05:00
Chris Meyers
5759db1229 flake8 fix 2016-03-04 14:14:10 -05:00
Akita Noek
e9c3d98a44 Merge branch 'devel' of github.com:ansible/ansible-tower into rbac 2016-03-04 14:02:01 -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
Chris Meyers
d56dc25314 do not require mongo to be on 2016-03-04 10:52:12 -05:00
Chris Meyers
cfeae51254 deny endpoint access to system tracking feature based on license 2016-03-04 10:14:13 -05:00
Chris Meyers
09c5a189ed remove forgotten print 2016-03-04 07:56:29 -05:00
Akita Noek
db6117a56d Added role description fields
Completes #1096
2016-03-03 16:19:10 -05:00
Akita Noek
048e65eab3 Add test to help detect incorrect role rebuilding 2016-03-03 13:54:45 -05:00
Chris Meyers
569dd83ff6 mock system tracking feature enabled 2016-03-03 13:53:25 -05:00
Chris Meyers
44618d4956 flake8 fix 2016-03-03 11:45:40 -05:00
Chris Meyers
60484267e7 Merge pull request #1088 from chrismeyersfsu/mongoectomy_cleanup
postgres fact cleanup
2016-03-03 08:31:43 -05:00
Akita Noek
c15d48a640 Locked down user/team role listing and role membership management api endpoints 2016-03-02 16:36:16 -05:00
Chris Meyers
b0d228579a add test case to verify delete logic 2016-03-02 12:57:52 -05:00
Akita Noek
9699f34976 Made org admin role a parent of org member role so admins pick up everything members are granted 2016-03-02 09:44:55 -05:00
Wayne Witzel III
a1cc5b06b8 Remove can_access methods and registration 2016-03-01 17:30:32 -05:00
Chris Meyers
4fc7fea2b8 follow up and finish option request test 2016-03-01 17:28:29 -05:00
Chris Meyers
4b56ea3d07 postgres fact cleanup 2016-03-01 16:57:22 -05:00
Chris Meyers
88865a2203 flake8 fix 2016-03-01 16:57:00 -05:00
Akita Noek
3db13bc33c Updated fact tests to use the divergent group fixture
A group fixture was created in different ways, one on devel and one on
rbac, this patch just normalizes to the one usage
2016-03-01 15:34:26 -05:00
Akita Noek
2c690c82d9 Renamed rbac migrations to be after the notification and fact migrations 2016-03-01 15:34:06 -05:00
Akita Noek
ea2cabe4d4 Merge branch 'devel' of github.com:ansible/ansible-tower into merge-devel 2016-03-01 15:09:58 -05:00
Wayne Witzel III
7033542910 Updated Invetory access 2016-03-01 15:01:33 -05:00
Wayne Witzel III
1d179574af Updated Organization and Credential access 2016-03-01 15:01:33 -05:00
Wayne Witzel III
380ccec687 started access refactoring, added UserAccess and updated how ALL permissions is checked 2016-03-01 15:01:33 -05:00
Wayne Witzel III
a4b3567619 Added migration to remove users/admins FK from Org/Teams 2016-03-01 15:00:53 -05:00
Chris Meyers
67d1aa6c86 migration with correct help_text 2016-03-01 10:39:51 -05:00
Chris Meyers
b5d8aa52c9 get accepts data param, use it 2016-03-01 10:08:08 -05:00
Akita Noek
f5e311f5ac Undo some more automatic work that we're suppsoed to test with our migrations 2016-03-01 09:56:43 -05:00
Akita Noek
41c06dc2d0 Update user migration to not bomb out when a UserResource already exists for a user 2016-03-01 09:54:35 -05:00
Chris Meyers
5340af2335 updated api tests to use new get fixture format 2016-03-01 09:48:58 -05:00
Akita Noek
73dc061716 Patch up our credential migration tests to undo some automatic work that needs to be done in the migration 2016-03-01 09:47:26 -05:00
Chris Meyers
f6fa11e383 fix Fact migration 2016-03-01 09:16:48 -05:00
Chris Meyers
356b9c99b3 Merge branch 'mongoectomy_implementation' into devel 2016-03-01 08:22:40 -05:00