1
0
mirror of https://github.com/ansible/awx.git synced 2024-10-31 15:21:13 +03:00
Commit Graph

6912 Commits

Author SHA1 Message Date
AlanCoding
dc37f00d0a use parent serializer method to avoid API browser job access check 2016-04-13 15:19:10 -04:00
AlanCoding
914918b5ae update permission logic, update job runtime tests 2016-04-13 13:30:06 -04:00
AlanCoding
6fc51e2d85 preparing for new incoming migrations 2016-04-12 17:09:25 -04:00
AlanCoding
b0bbeb2ca8 move credential to prompt-for mechanism 2016-04-12 17:09:25 -04:00
AlanCoding
0dff851f62 JT validator: check for prompt_for cases to reject, and flake8 2016-04-12 17:09:25 -04:00
AlanCoding
52d8993aa8 update tests to conform to new credential behavior and launch response 2016-04-12 17:09:24 -04:00
AlanCoding
86aa0136a2 runtime inventory compatibility with blank, and resolve issue #1453 2016-04-12 17:09:24 -04:00
AlanCoding
f471f9b072 change migration to allow blank inventory field 2016-04-12 17:09:24 -04:00
AlanCoding
68d8d25d64 fill in prompted data from JT, use standard launch permission, and compat code 2016-04-12 17:09:24 -04:00
AlanCoding
056a7d798a prompt-for vars in API browser box smart behavior 2016-04-12 17:09:24 -04:00
AlanCoding
bea15021b3 ask_for_inventory permissions and runtime tests finished
cleanup prompt-for additions

update migration after rebase
2016-04-12 17:09:24 -04:00
AlanCoding
19b855a4d3 prompt-for acceptance code in JT model 2016-04-12 17:09:24 -04:00
AlanCoding
cc84ed51d6 Add ability to prompt for several variable types on launch 2016-04-12 17:09:24 -04:00
Matthew Jones
28ffa57258 Implement rbac and related unit tests for notifications 2016-04-12 17:00:38 -04:00
Akita Noek
40731f6fc8 Merge pull request #1513 from anoek/1499
Fix erronous singleton role created for users
2016-04-12 16:54:19 -04:00
Akita Noek
3f0ea18e10 Merge pull request #1516 from anoek/devel
Fix bad migration from #1496
2016-04-12 16:52:38 -04:00
Akita Noek
1d27ddc7d2 Fix bad migration from #1496 2016-04-12 16:50:54 -04:00
Akita Noek
2ccd46de11 Merge pull request #1511 from anoek/explicit-implicit-parents
Switch to explicitly stored implicit role parents
2016-04-12 16:34:10 -04:00
Akita Noek
d6d8390f8c Merge pull request #1480 from anoek/migration
Migration fixes
2016-04-12 16:33:54 -04:00
Akita Noek
caab5b7e20 Merge branch 'migration' into explicit-implicit-parents 2016-04-12 16:31:51 -04:00
Akita Noek
ad89491a07 Fixed bad merge 2016-04-12 16:31:11 -04:00
Akita Noek
ea3a7ef227 Merge branch 'devel' of github.com:ansible/ansible-tower into migration 2016-04-12 16:30:09 -04:00
Wayne Witzel III
6bc765d1b5 Merge pull request #1507 from wwitzel3/rbac-bug-1422
RBAC Job Fixes
2016-04-12 16:22:47 -04:00
Akita Noek
a0356afbac Improved code clarity and UI naming for user owner role creation
#1499
2016-04-12 16:11:45 -04:00
jlmitch5
e3ebbab17d fix list label of status 2016-04-12 15:58:17 -04:00
Akita Noek
c984b33f1e Fix erronous singleton role created for users
Needed to be just a normal role, ie with `name` assigned instead of
`singleton_name`

 Addresses #1499
2016-04-12 15:43:27 -04:00
Akita Noek
563917a217 Merge pull request #1509 from anoek/devel
Fix faulty activitystream test
2016-04-12 15:41:25 -04:00
Akita Noek
1369be8f17 Merge branch 'devel' into explicit-implicit-parents 2016-04-12 15:13:37 -04:00
Akita Noek
29c7ecf6a8 Merge branch 'devel' into migration 2016-04-12 15:12:43 -04:00
Akita Noek
8c917de24d Fix faulty activitystream test
Test assumed that the only entry in activitystream would be related to
the creation of the organization, which in this case was not true, the
most recent being something related to the user object being created or
modified.
2016-04-12 15:03:24 -04:00
Akita Noek
6039ad92e9 Merge branch 'devel' of github.com:ansible/ansible-tower into explicit-implicit-parents 2016-04-12 14:51:30 -04:00
Akita Noek
7b4e7ec5b3 Switch to explicitly stored implicit role parents
Completes #1496
2016-04-12 14:50:52 -04:00
Akita Noek
7e0bfc9831 Use --nomigrations for py.test
This is for two reasons, 1) it's a lot faster when starting from a new
database, and 2) since we do database work within our migrations, it
doesn't actually work within py.test, which is either a bug in
pytest-djano, or a horrible behavior of pytest-django.
2016-04-12 14:32:10 -04:00
Wayne Witzel III
7cd4fb7b7a Merge pull request #1502 from wwitzel3/rbac-feature-1324
Update docs, driveby test fix.
2016-04-12 13:32:56 -04:00
Wayne Witzel III
e5b9766c8f Update Job start / access permissions 2016-04-12 13:28:03 -04:00
Chris Meyers
69812fc8ab Merge pull request #1490 from chrismeyersfsu/fix-labels_unique
cascade delete labels
2016-04-12 13:09:26 -04:00
Akita Noek
b77d8dab47 flake8 fixes
Signed-off-by: Akita Noek <anoek@ansible.com>
2016-04-12 12:04:39 -04:00
Shane McDonald
629c46fb0c Merge pull request #1501 from shanemcd/fix-ami-install-script
Make Packer inventory consistent with setup/inventory
2016-04-12 11:51:24 -04:00
Akita Noek
e9aff8d67d Moved necessary add field migration to exist prior to dependent implicit role field which references the field 2016-04-12 11:40:17 -04:00
Akita Noek
74d86859f1 Fix project migration when project has exactly one org 2016-04-12 11:40:17 -04:00
Akita Noek
5f8e7bbf55 Replace user.admin_role usage with manual version that works in migrations 2016-04-12 11:40:17 -04:00
Akita Noek
86e29221d5 Fixed missing orgfunc usage to resolve organization during credential migration 2016-04-12 11:40:17 -04:00
Akita Noek
59b6ed3b9c Update rbac schema migrations so we have all parameters we need to operate during a migration
We need all those rbac fields definied in the migration in order for the
current apps to have access to them during a migration.
2016-04-12 11:40:17 -04:00
Akita Noek
e3a45235a6 Do an initial save on all resources during amigration to force the creation of RBAC role objects. 2016-04-12 11:40:17 -04:00
Akita Noek
7d2e660749 Make use of 'current' apps so RBAC ImplicitRoleField can work during migrations
While a migration is taking place, we can't juse use normal model
references like Role and RolePermission, nor can we use generic foreign
keys without manually referring to the content type and object id
fields.
2016-04-12 11:40:17 -04:00
Akita Noek
682552d9b0 Added field deconstruct method so ImplicitRoleField works in migrations
Apparently we need this, who'da known.
https://docs.djangoproject.com/en/1.9/howto/custom-model-fields/
2016-04-12 11:40:17 -04:00
Akita Noek
274744b4c1 Replaced Role.singleton usage in migrations as it doesn't exist here apparently 2016-04-12 11:40:17 -04:00
Akita Noek
ec439126e0 Added created/modified and another content_object fix in our migrations
#1380 #1425
2016-04-12 11:40:17 -04:00
Akita Noek
b1c568e4d9 Fix invalid usage of content_object during migrations
#1380
 #1425
2016-04-12 11:40:17 -04:00
AlanCoding
98dd79775b series of tests to verify user executing permissions 2016-04-12 11:37:33 -04:00