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

7165 Commits

Author SHA1 Message Date
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
Jared Tabor
62ecefb716 removing unncessary line 2016-04-12 12:55:01 -07:00
Jared Tabor
462eb19087 Changing ngToast success color 2016-04-12 12:55:01 -07:00
Jared Tabor
de56747d1c Cleaning up code from PR feedback 2016-04-12 12:55:00 -07:00
Jared Tabor
72ae8f46c9 Adding notifications into the UI 2016-04-12 12:55:00 -07: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
Ken Hoes
dfaffdea56 Updated to handle fact vs. facts responses. Removed accidental commit inclusion from branch. 2016-04-12 13:20:21 -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
Wayne Witzel III
558311eaed Fixup inventory test 2016-04-12 11:29:59 -04:00
Matthew Jones
b4ef0304e3 Add funcsigs as a direct dependency for the venvs 2016-04-12 10:48:49 -04:00
Wayne Witzel III
476c43f7a7 Resource fixes
The idea of a resource is an abstract one using Generic Foreign Key and not a concrete one with a model.
2016-04-12 10:38:24 -04:00
Chris Meyers
0d0115ef5e include migration 2016-04-12 10:23:43 -04:00
Wayne Witzel III
a244af5360 Update Role model method docs. 2016-04-12 10:11:38 -04:00
Akita Noek
18dea2203f Removed unnecessary rebuild_role_ancestor_list call in a test 2016-04-12 09:55:20 -04:00
Shane McDonald
81268f7106 Merge pull request #1497 from shanemcd/remove-unnecessary-config-play
Remove unnecessary play in configuration playbook.
2016-04-12 09:35:22 -04:00
Akita Noek
dc70262d39 Merge pull request #1435 from anoek/user-activity-stream-updates
Added activity stream events for User
2016-04-12 09:10:52 -04:00
Akita Noek
ecedf491a4 Removed erroneous sso login error log
The log message here does not indicate a login failure at all, in fact
it doesn't appear like we get a login failed message, they just don't
get authed.
2016-04-11 23:17:10 -04:00
Akita Noek
c4a1f55f53 Merge pull request #1414 from anoek/access-list-updates
Updated access_list to include team information for indirect access
2016-04-11 17:04:53 -04:00
Akita Noek
24a841a0bf Added sso login logging
Part of #1087

This is untested as we need to have a public facing machine to do SSO
stuff against.
2016-04-11 17:03:04 -04:00
Akita Noek
f3cae7e1f0 Log basic auth requests to the debug log
Part of #1087
2016-04-11 17:03:04 -04:00
Akita Noek
6182dad0d4 Added activity stream events for User
Completes development for #1087
2016-04-11 17:03:04 -04:00
Alan Rominger
86d98e0999 Merge pull request #1493 from wwitzel3/devel
fix open_fifo_write call
2016-04-11 16:24:43 -04:00
Wayne Witzel III
12b1068ed4 fix open_fifo_write call 2016-04-11 16:23:06 -04:00
Chris Meyers
5bf83e8b64 cascade delete labels 2016-04-11 16:02:42 -04:00
Shane McDonald
0a15ece049 Merge pull request #1483 from shanemcd/packer-centos7
Use CentOS 7 as source AMI in Packer template.
2016-04-11 15:06:23 -04:00
Wayne Witzel III
5154e19565 Merge pull request #1484 from wwitzel3/invsrc-cred-migration
add migrations for invsource and credentials
2016-04-11 15:03:49 -04:00